From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: ARC-Seal: i=1; a=rsa-sha256; t=1521828373; cv=none; d=google.com; s=arc-20160816; b=mVgh/RoGHlbaUZm2iMzuGWgVuT36vi6GE5YufWpQEEHdncU8uo1JAEFgWtWDNIMEcX 9QCyEUVcHjC5hzRwkZRioGnN78VXfIEGS//F1nUpqzVrxC2TjoqKzhOGeew4f5eu9ybE 6vq1gICa/dy1TpG2dDQRFNxBJoYqGkXE58DHIgBrwYJmq89wkrOX9t7YIuXUr/D7GDyZ qQei/pfRTOa3jaJ0snzBiRp4od4nUKw7EkW0YCSazw6HgJi0pwlZBJidpL9Amp8mOUsO 91/9wSewQZD2olmmavvzAx8zb3xTMFvf01HDcaGIVSHwd0cXmpfBoYuCb1ZXHsEexxXc 9zrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=a4c1gytJZp4m5M68+y/uRG66+WAsPDvlAd7TlzajesE=; b=ikh2S/mRbTEOEqMO1x83oKz19PmQYW8lQd8Ku7uMUNbGzwfS9pspvCmho1NyW70LAB voPWgRgF4y66BNmYXwZPtX+hAj8ej2Hz7kIqxzJuN1tp8bwGexhVncuU+QbFU8u7FElx NpDB1aSYBQk9l/xmWhHGOjmCC7Y2i1ygQ6o234ie7CBduTiZWOYb8eWPH6+cyv2E0nth /8/c+cMD9PWnrkqsBF33W1kXboPaqwU9dpuTbysYv7yULndMRZfn/pWa3DqlXtASrJid eVmNfajwfaVNe1zYUTBEg2fa1xJldhTM0PjbKedslOvJ0SYD0r0+8vgIxH6jEhwnNBYA rsIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=MhDESDif; 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 Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=MhDESDif; 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 X-Google-Smtp-Source: AG47ELvhYzmyzGbJgEvTRMJW5391uh/MtX4IPhK6FpA7lF0Zcya+Zm7phzMjRPasnCVYJ6qW/eXIqw== From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Jonathan Corbet , Catalin Marinas , Will Deacon , Christoffer Dall , Marc Zyngier , Christopher Li , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Masahiro Yamada , Michal Marek , "GitAuthor : Andrey Konovalov" , Mark Rutland , Ard Biesheuvel , Yury Norov , Nick Desaulniers , Suzuki K Poulose , Kristina Martsenko , Punit Agrawal , Dave Martin , Michael Weiser , James Morse , Julien Thierry , Steve Capper , Tyler Baicar , "Eric W . Biederman" , Stephen Boyd , Thomas Gleixner , Ingo Molnar , Paul Lawrence , Greg Kroah-Hartman , David Woodhouse , Sandipan Das , Kees Cook , Herbert Xu , Geert Uytterhoeven , Josh Poimboeuf , Arnd Bergmann , kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-sparse@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org Cc: Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Kees Cook , Jann Horn , Mark Brand Subject: [RFC PATCH v2 07/15] khwasan, arm64: fix up fault handling logic Date: Fri, 23 Mar 2018 19:05:43 +0100 Message-Id: <8730a515edf9815619244c63a00d9c15fef09dff.1521828274.git.andreyknvl@google.com> X-Mailer: git-send-email 2.17.0.rc0.231.g781580f067-goog In-Reply-To: References: In-Reply-To: References: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1595752708042014816?= X-GMAIL-MSGID: =?utf-8?q?1595752708042014816?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 --- arch/arm64/mm/fault.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index bff11553eb05..234613777f2a 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -133,6 +134,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; -- 2.17.0.rc0.231.g781580f067-goog