From patchwork Thu Aug 9 19:21:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10561743 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 4D46B174A for ; Thu, 9 Aug 2018 19:21:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C5512B855 for ; Thu, 9 Aug 2018 19:21:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A3CD2B92F; Thu, 9 Aug 2018 19:21:49 +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 CB5362B93C for ; Thu, 9 Aug 2018 19:21:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4ABBF6B026C; Thu, 9 Aug 2018 15:21:32 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 40BFB6B026D; Thu, 9 Aug 2018 15:21:32 -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 20E0B6B026E; Thu, 9 Aug 2018 15:21:32 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f71.google.com (mail-wm0-f71.google.com [74.125.82.71]) by kanga.kvack.org (Postfix) with ESMTP id B6F9F6B026C for ; Thu, 9 Aug 2018 15:21:31 -0400 (EDT) Received: by mail-wm0-f71.google.com with SMTP id s18-v6so707144wmh.0 for ; Thu, 09 Aug 2018 12:21:31 -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=8+04WRzIPiPgey4OPz4HFnYO/J88O5syronaT3xg5j0=; b=d09DjYF+6dpKYIUYmO9ZnGDyTNsMvQY67w1v12FxEaK0eCJca7JoqJP2Qne+am3v5F 3xwXR3S7PJms+BqYLUKlS/yyApEqpprbAFG1Q2SajvB+U0tV0Bn/ucsW5mY4T35XYuwG lgyVWoz+R1SFc9tEzouHq2lwmWDA/gZxaI9Nr9n8fHFEmz282VFH97G3DXHkA3laTu8W pPmJOuHJ5yxEqpISErjcFgdVJhVJv2o7fz0MhpyJNYs3hpeeLB/WrCV8qDsAID4j7v3w MEJVy54gHv80/jym+6YH1hgr5gSx9C5Vgt9ipi5R9957IbgEXJOdMeECCWG1ESkBYLbu 7xZQ== X-Gm-Message-State: AOUpUlFGvzX3M4XL44a7+evEIoxEJTgYct1JwLqYXCwyfzzETtbabcX5 SeZjbDkB7ydzv9UnK2sk+FNR5IN8TMpdRS+D2EuYRJzgQf6KfRnID3nRoFpsaRKwpB6I0kVm26M Wuj0lyZhmvH3hcz72vvAxUXSOAD/vYkvxw/EeSN2XenMuijOGWeEhc6HxgP8+qFrIZ34IpKuz+z 95KLJZIy4Ocu6TgQrDUnz8bOJJBIwIxKJ1HuTKsrPd5XQTPzSofu3tnyN9h+DFMAKe4Gz5+Dssl PI9ug7XC0JJ9f8dNm+wa1RxQ22XDgUEMwtBo0I+ea40Lx7uNHqWhorhXmQh2nnjWLZizHjmRPvz GnEFjprgtBE2KzV3y2m5wHXGje7YW3+JfTr3Q7K6HYDtdTMQSzaRhT9Rlr45ySI+zzp9mRlkBRP I X-Received: by 2002:a1c:96c8:: with SMTP id y191-v6mr2337743wmd.37.1533842491256; Thu, 09 Aug 2018 12:21:31 -0700 (PDT) X-Received: by 2002:a1c:96c8:: with SMTP id y191-v6mr2337718wmd.37.1533842490480; Thu, 09 Aug 2018 12:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533842490; cv=none; d=google.com; s=arc-20160816; b=zjztEKhZZbYYa+TtZAAH9/Yga6DU3RB6sJ2Puwfj6K6+XiR4PkHDfq/NKwi2ibJ2Oq lqeLjBcKiARC7+BM3nuK8cEr80+5GZM/Znyo2KYmRtHNKlV1MSY44RMgWFRZ3yhT0T9t TNt5yslfEWHGaHtdZJbGLL2CJ+8zMHKHRCLl7r3sU/U2bl0yzFHvo4sX81hNmqqjWm6F rF72CBoiclXdH3y7dJfIIdSU75TvX4jRAo10sO6nBtpPIhLCyJcE21J6fgyNoN0Cx2ts XXnjha2mlPQKVNKhoadLvuIU3TiibA6iaw+eB/9TM37Pmkd1MZqYM88rXhreQNnrBj6k qtfw== 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 :arc-authentication-results; bh=8+04WRzIPiPgey4OPz4HFnYO/J88O5syronaT3xg5j0=; b=aDJh3AFEgYoVT5PSAm10YeKITC72tZfP+Dk4/m4+ogoOKOcRf27ZmejuhlIWR1lsaj kfkMZymxbrH1K1eQ+1PZ0R4E3f8pk9LLEKi5LnjSRm3pL3JkdGT0ES4QPLRcSl+FHEnp lLSn0oiFg9ry4HkoemaZsIWcOW15v+GZeBeVcZ06zcVMjHY8k30Y6vchCaBVCHQ4n3Yb FJnk8qho92Ay7Ypf55xH3LBCN2xcVv6QSjCQZIzcHc5Jm5KzlWO9W/85mze9saDPxFW2 QvIljEJbNQ6Qf/wx2Hat71m9HEygEP5qQlAybX451lEGLe60W7OZwfTW4AD3MECaijBM cl7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=nxQ591Vh; 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 y1-v6sor3090273wrl.6.2018.08.09.12.21.30 for (Google Transport Security); Thu, 09 Aug 2018 12:21:30 -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=nxQ591Vh; 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=8+04WRzIPiPgey4OPz4HFnYO/J88O5syronaT3xg5j0=; b=nxQ591Vhu03jnMxTYftvDNh225xeMHTn98JxuP6moeqXBbN9Wz89hlVBaEjcdTix/Q JRwhpBR80Gj1SHIRxBzEIJpPHE0ATKaojKZcNppqoD3eSLfSwJt62hQcbI+yB1lR5U0g 2EctZIagziNIyXWykgBIYJMtOuzWS4CSipKmJoUvEfFlMHcj2uAwIxJ7RR5ZA4IPAUhu 5w9rpydzp/Auhu1I81jLZccIFqUC+UGbqcwsEghtsA0vN32f/VyWRYK9wFnoNr4dHP6k kjHB0RKkKxr6fPi5vhpNLvGvoiUJVpk4pPHrJNama0hpw7dPu9m1uD3R+oeqfeucRXyC GqpQ== X-Google-Smtp-Source: AA+uWPwd82lZWG8HymUYNafSfNQe3iX/xSKDivVKRCbcK1qe34tzRwCCiSDAxySAScuUxsFNJYa/KA== X-Received: by 2002:adf:a789:: with SMTP id j9-v6mr2120826wrc.277.1533842489885; Thu, 09 Aug 2018 12:21:29 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id o14-v6sm14738797wmd.35.2018.08.09.12.21.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 12:21:29 -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 v5 09/18] khwasan, arm64: fix up fault handling logic Date: Thu, 9 Aug 2018 21:21:01 +0200 Message-Id: X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-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 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 b8eecc7b9531..b7b152783d54 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)khwasan_reset_tag((void *)addr); + if (addr < TASK_SIZE) { /* TTBR0 */ mm = current->active_mm;