Message ID | 719e17667dcf93c2789c2b6c873aa424cfe378b9.1529515183.git.andreyknvl@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 218E460383 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 20 Jun 2018 17:40:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D03828D69 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 20 Jun 2018 17:40:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 008A528D9A; Wed, 20 Jun 2018 17:40:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9942828D69 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 20 Jun 2018 17:40:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5561A6B026B; Wed, 20 Jun 2018 13:40:20 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 499F86B026C; Wed, 20 Jun 2018 13:40:20 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 352336B026D; Wed, 20 Jun 2018 13:40:20 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr0-f198.google.com (mail-wr0-f198.google.com [209.85.128.198]) by kanga.kvack.org (Postfix) with ESMTP id CEE0D6B026B for <linux-mm@kvack.org>; Wed, 20 Jun 2018 13:40:19 -0400 (EDT) Received: by mail-wr0-f198.google.com with SMTP id i14-v6so273864wrq.1 for <linux-mm@kvack.org>; Wed, 20 Jun 2018 10:40:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=p85QUjRuow4dpc/B2Caf2sJdJzBwj5MZiQXcRPnXZZs=; b=qjz1VRKFCEL50wGhqYPi8TeHdwm0a/jCKO3RBoVYcVu5jShxZB5yxAlYUVDygDX9ua rcK+F+2uQl6rievzmterpxyd0fcAbM4fE6YJcYYAT8bWm0Jldl37ydVwM85z/HUakjFD B5h569h+poSSnvkvqLDLoVWhYYclBXn1ph/piggspIV73kFDdl6Wqz68E7GlmpBmRz8I 2GdP0h2lTvI2KSZZg9AYRMHsgNYrwYEdsBqRqUC8lCNxcdoHY8Te1ldb7poG1Rw5tWNw zqGg7yGLHEiJ/NcAo0p48fARmgiro6nmxoPFvlU2i2igXKRi2e6nouzj1QeMygnB8ZFW DnJQ== X-Gm-Message-State: APt69E3MPekWuBYj6tkA8BmxqIrEQpxHYl8cHVRdR3crL/ATsejXLItb 5FQru1MIaRIlZvuzHtPNkkFzRA7KawG1rWQlsoBijDc+lm1oCOYLYyGYX1Y7C3169Ti7f9HRAnf 1DqbZDfXLcabRg9ow2pvYKDaFVFDw3YTA5/xZPt9LEpTGETzXakdr05UioF1/DA+hOlV523jyWY Otu/nQOIvjsnJfpl+jWi3QMfpEgIheS+f8cAwx46DsNmAOGSoirPSuA1JNvJcOhjCsiXmGQKcnZ BM9MbJ/4a6Cl+7OXewKPHQcL+Z3QyI1Cx6zkhlDPlvcKUtHEi+2TKT/XJNJJ9dyLkt4FfUYUzSJ DOzf8Kd813zKHxXIEUc9/iHbeGUvEnsHHjEFe4QFV+COTREqY+aEl4WUdpIsXZ611TmK+y/aHfD 0 X-Received: by 2002:a1c:14cc:: with SMTP id 195-v6mr2417011wmu.48.1529516419404; Wed, 20 Jun 2018 10:40:19 -0700 (PDT) X-Received: by 2002:a1c:14cc:: with SMTP id 195-v6mr2416985wmu.48.1529516418761; Wed, 20 Jun 2018 10:40:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529516418; cv=none; d=google.com; s=arc-20160816; b=zSILL4dF3+3ZxMa7wlLiku8DRVZQVTSNo91nIEVI2yBlfVC84/aHClaGnE4/SleK5H zdjzlqdAJ3jKGINXn5jWJAYvMgzkKNC1qGeSMVoYTs2HkaLyoc05iVut9ycZQZPEjaOH +yb2xXEs9ztKfVgxH36OmDsV2n2HLAczgfZ9Sl2/ZWKzfNuIN2hd82CLpURx1wRbgwRC wa/Gi+eNwlcslwzKlxBuKerVHqoBOCI62I0A9p05NkosQj3CHgV82WBW30aFaZoMW8fl PZoYiPMigIggse+PegdhDDqHxBOb2LmJEDLxyz4/QxRJEjld66IbviaEsd1XwdYOBZQT jAyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=p85QUjRuow4dpc/B2Caf2sJdJzBwj5MZiQXcRPnXZZs=; b=SNv5InHiX+fA1YnAOrltb52ZMXdDu7i9H6HEpPmqPzSWXSRc9V4pFVwfyxyePSHP1a Wa0aV0fgU7/o3xCfthc+XDwku4RL4zSY2LLYfUcSc+Hr2Eu2pIWzT32ZZbrZv+baWjWw NLpOFuEky18CoS0hbEJcMaX66E5KuZBS7fXqbXItsTCJMPdzFr/j350rt8H9jm+fXWim ecYiRE5jVBRpiqz0RG3FpTmWr7hp5U86nKwAJQF2N54tLaE4r7cabEGv0jeTnQh9nqxr N2SWRPxtDa+bSwi7xW96P8rM81gT/b+yCq+YIke20YQHduAJjiZm/WFuYArYalYruznm K4WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=cKMog7X2; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j22-v6sor1083243wmi.34.2018.06.20.10.40.18 for <linux-mm@kvack.org> (Google Transport Security); Wed, 20 Jun 2018 10:40:18 -0700 (PDT) Received-SPF: pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=cKMog7X2; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=p85QUjRuow4dpc/B2Caf2sJdJzBwj5MZiQXcRPnXZZs=; b=cKMog7X2WPJDh2SetkEA2LzVcfeVlPSabg492BhqyjJtuk+uD7mTbXUGHMgXgkX0+z nce3cY4HpUrBw2dF+w26cohuQ4LNOVcnNXjygWthLCk5admFeUUoeT0ZzaFLe4N4HFjx fKpPqS151IMpsM7atSDyWsyMpcCrNy9NQlI2dNd4Du2t4dOjlcjw00mWxwEZWwpfndjG 3EWMUA95vJDt0+oxJwNAjTg5w4uOiJKAvYJnJZM0head/QBtWLMSQ9Z84Hk09NAOo4YB lU0wq9CXKzi00S9pI0LIKDVfcUUf8vgBMRQOCs7XSLki1DUDDpXZ2akjY+iCFrfUVKk/ 6VyQ== X-Google-Smtp-Source: ADUXVKI9lnsolI1QB0qhbD0NkTANy1JGmjbguTtaYpBwlZAz0SNSWmijMIO+Jx4xdTEuQeLjLXl71Q== X-Received: by 2002:a1c:4adb:: with SMTP id n88-v6mr2543982wmi.121.1529516418195; Wed, 20 Jun 2018 10:40:18 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id f18-v6sm4388598wro.1.2018.06.20.10.40.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jun 2018 10:40:17 -0700 (PDT) From: Andrey Konovalov <andreyknvl@google.com> To: Andrey Ryabinin <aryabinin@virtuozzo.com>, Alexander Potapenko <glider@google.com>, Dmitry Vyukov <dvyukov@google.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Christoph Lameter <cl@linux.com>, Andrew Morton <akpm@linux-foundation.org>, Mark Rutland <mark.rutland@arm.com>, Nick Desaulniers <ndesaulniers@google.com>, Marc Zyngier <marc.zyngier@arm.com>, Dave Martin <dave.martin@arm.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, "Eric W . Biederman" <ebiederm@xmission.com>, Ingo Molnar <mingo@kernel.org>, Paul Lawrence <paullawrence@google.com>, Geert Uytterhoeven <geert@linux-m68k.org>, Arnd Bergmann <arnd@arndb.de>, "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Kate Stewart <kstewart@linuxfoundation.org>, Mike Rapoport <rppt@linux.vnet.ibm.com>, kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sparse@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org Cc: Kostya Serebryany <kcc@google.com>, Evgeniy Stepanov <eugenis@google.com>, Lee Smith <Lee.Smith@arm.com>, Ramana Radhakrishnan <Ramana.Radhakrishnan@arm.com>, Jacob Bramley <Jacob.Bramley@arm.com>, Ruben Ayrapetyan <Ruben.Ayrapetyan@arm.com>, Jann Horn <jannh@google.com>, Mark Brand <markbrand@google.com>, Chintan Pandya <cpandya@codeaurora.org>, Andrey Konovalov <andreyknvl@google.com> Subject: [PATCH v3 07/17] khwasan, arm64: fix up fault handling logic Date: Wed, 20 Jun 2018 19:39:53 +0200 Message-Id: <719e17667dcf93c2789c2b6c873aa424cfe378b9.1529515183.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-goog In-Reply-To: <cover.1529515183.git.andreyknvl@google.com> References: <cover.1529515183.git.andreyknvl@google.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index b8eecc7b9531..b7b152783d54 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -32,6 +32,7 @@ #include <linux/perf_event.h> #include <linux/preempt.h> #include <linux/hugetlb.h> +#include <linux/kasan.h> #include <asm/bug.h> #include <asm/cmpxchg.h> @@ -134,6 +135,8 @@ void show_pte(unsigned long addr) pgd_t *pgdp; pgd_t pgd; + addr = (unsigned long)khwasan_reset_tag((void *)addr); + if (addr < TASK_SIZE) { /* TTBR0 */ mm = current->active_mm;
show_pte in arm64 fault handling relies on the fact that the top byte of a kernel pointer is 0xff, which isn't always the case with KHWASAN enabled. Reset the top byte. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- arch/arm64/mm/fault.c | 3 +++ 1 file changed, 3 insertions(+)