From patchwork Wed Sep 19 18:54:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10606259 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 92E0C6CB for ; Wed, 19 Sep 2018 18:56:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 861732B5EA for ; Wed, 19 Sep 2018 18:56:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79C372B840; Wed, 19 Sep 2018 18:56:05 +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=unavailable 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 18DE82B5EA for ; Wed, 19 Sep 2018 18:56:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D4D28E0011; Wed, 19 Sep 2018 14:55:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 084B28E000A; Wed, 19 Sep 2018 14:55:23 -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 E8F258E0011; Wed, 19 Sep 2018 14:55:22 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by kanga.kvack.org (Postfix) with ESMTP id 89DDF8E000A for ; Wed, 19 Sep 2018 14:55:22 -0400 (EDT) Received: by mail-wr1-f70.google.com with SMTP id y32-v6so6636841wrd.19 for ; Wed, 19 Sep 2018 11:55:22 -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:mime-version :content-transfer-encoding; bh=xtJgUAWOXZXX0dAHUptbPqpenfy7NgkmLyignEvLyTk=; b=r7c3awza1YRUks/zfGFEjFMvt2p+qJ2luB2d0ndd9nGmQusWqtBT7Kf6BMw0KsbfSO JIMJqUo1AJG2tQ6a4KvnzlHiKzUlW13qG4Q3mIKcb3Cx2kcxYC9027fXYTx21VTDvWO6 ykxraxKLICjnY4KzN2U+Rg7o9/VhHEWsqp/bGOWjE6CXLNbT6NpU5V9sSpVHtwezqM9e y5L1XXKReT7vhLSsHCoW+HI0efnrCIG3MbEMX47GzGBUd+ZAoW214sMxgKQoGVklgEdt bHv0vwFaXE6mrmeGyoADJHNYjCCB5syuR2GjdreAe8ckoWylDG/6LaEYisqh9ha5G1Fz 7JVA== X-Gm-Message-State: APzg51C8UNOuF1omNjTc5JGt7XQy9d/hl13NbEWYsehhktfXpJCtYDj2 tCT17073srrzvc5+Grj127dqKF43KW6tpQfMT/EevVARTh+o2PsFFx4uX3Hljuu7507D7UE7nmN CGHXVwVstCjWIwBNFNi0qxPBJyYEntHfCdhKWAVvWBIISJ8VWJn0shYyekFtY8TWUNOX0HNX8jJ 6vyugwJ11dLKUopksDVxEXyxlz6xh1pXimzeIbp35x0vou1+91DZwI8/II7Rmr1YCLb8LrKti1J /mjPWujEuLSbxBKN5A3svCoiB9mDvJmWmC+k+9WlWXw1fLMl6qMvbWEuFLJKr5V3wQtC7yNb/Ew TgKBiBFaoKrsmZUkooSplrk2gfJJJAnMa7B9oiMRFV99s6cO5RfdbpEICs5H7hQ80IfQN0Zqnjk U X-Received: by 2002:a1c:9d02:: with SMTP id g2-v6mr21123696wme.122.1537383322097; Wed, 19 Sep 2018 11:55:22 -0700 (PDT) X-Received: by 2002:a1c:9d02:: with SMTP id g2-v6mr21123676wme.122.1537383321611; Wed, 19 Sep 2018 11:55:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537383321; cv=none; d=google.com; s=arc-20160816; b=aM8I4E31d5HMBL/d4LBFf+Ou9gLebM4ysIxaDB9gq4+zpUiStK+sB17bUogSNFlzWn X9g5NO9nob2oBN/c0DdztwgkBYsvEqX22XllAlDHMO+XFxt2bP3khLVBvyQlF/aWw5J4 SB23mtlOzIFSbAerOmjq0+iERuw+DZUUPZmutDC31usciWSgceOIz3HD8+DdMwUsAXB/ WkdfjiO86ocfBH0SQ9wdsFuRAlwnLEXC4S2sPanmoekk0Po/MIJDYA5YhWY629+5jCbV dh+9sUMK1qgrkYCDJuGRN/UU87FdYtVdiiGVzz5Ft+ygQ3sZVYxnMRnfGEMOUq8iJ93x PLYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=xtJgUAWOXZXX0dAHUptbPqpenfy7NgkmLyignEvLyTk=; b=lq4lkrRh/czQpipUqvZYaMQDu3ip11AuBR2AabJP85OTxwAiOJT92/FqpTaKVQpFuu 2/j0R4a+p9zF/0tD7Y2FrkKLda8x2SzrTkb1N1qJFPwvuImYMZFrgMOGQGX+fDCbEb39 fGS+OZ5IVfZMPjVdROvwk2ofDnPaYdPVc+m3XIhXQbEZGplvwISFlospxLzK/9d+hEJK q7XjtVqm9gReHy1yrboGwxkKzVLlOQvXzlQP06w2uann8e47+zAib6rpY2stCPx6W8Tw v+6EInX7v6ZwYKJmQAR4g2tKwYch6PcLlRXR+2XTRlop8M28pZzxVptHciaC+SwOMP3H 41Zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=vPuyihbl; 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 69-v6sor16557783wra.43.2018.09.19.11.55.21 for (Google Transport Security); Wed, 19 Sep 2018 11:55:21 -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=vPuyihbl; 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 :mime-version:content-transfer-encoding; bh=xtJgUAWOXZXX0dAHUptbPqpenfy7NgkmLyignEvLyTk=; b=vPuyihblvxcn0sLFem62r23wIGYYYskYXdS/f0UduHxfmXZcYhZa+1inXCT+EVC71b xR9esBpfVNjAw5O1xd94Y0Ta9SiVI5dJ17z93VEQu3KYeWrfq33uQUDvbvmcGV6iZTUb b+9TkA37Wz+GEuxDBV724TGKdy1T52jCVQWAgTPE79jxFsVOoaSYOixroijjzYzATXJ1 jj4LdW4Md3upKR14f85br611JPh1UrMa8LADi2b3KZ1rAmXkL7gTDaLh1qx5/UUIf96h Ykig492trKfPPYXL59tNXdfV/Ll/v7d93Di9WJRRygDSUcHJLfMTsoWN2l6fYWF3kink jUjw== X-Google-Smtp-Source: ANB0VdblUI7MFFp8hCfvF9UePgtJJWb/kUMM90uaKcYDdSH4MK9TlKqZCLxx5yQlpghBFlT3+9tF4A== X-Received: by 2002:adf:9464:: with SMTP id 91-v6mr30486547wrq.231.1537383321264; Wed, 19 Sep 2018 11:55:21 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id b10-v6sm8510065wmc.28.2018.09.19.11.55.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 11:55:20 -0700 (PDT) From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Catalin Marinas , Will Deacon , Christoph Lameter , Andrew Morton , Mark Rutland , Nick Desaulniers , Marc Zyngier , Dave Martin , Ard Biesheuvel , "Eric W . Biederman" , Ingo Molnar , Paul Lawrence , Geert Uytterhoeven , Arnd Bergmann , "Kirill A . Shutemov" , Greg Kroah-Hartman , Kate Stewart , Mike Rapoport , 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 , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Jann Horn , Mark Brand , Chintan Pandya , Vishwath Mohan , Andrey Konovalov Subject: [PATCH v8 11/20] kasan, arm64: fix up fault handling logic Date: Wed, 19 Sep 2018 20:54:50 +0200 Message-Id: X-Mailer: git-send-email 2.19.0.397.gdd90340f6a-goog In-Reply-To: References: MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP 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 tag-based KASAN. This patch resets the top byte in show_pte. 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 50b30ff30de4..78328c864d01 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -134,6 +135,8 @@ void show_pte(unsigned long addr) pgd_t *pgdp; pgd_t pgd; + addr = (unsigned long)kasan_reset_tag((void *)addr); + if (addr < TASK_SIZE) { /* TTBR0 */ mm = current->active_mm;