From patchwork Tue Jun 26 13:15:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10488909 Return-Path: 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 903B560386 for ; Tue, 26 Jun 2018 13:16:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 807412893B for ; Tue, 26 Jun 2018 13:16:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 741452893F; Tue, 26 Jun 2018 13:16:07 +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 2A80D2893B for ; Tue, 26 Jun 2018 13:16:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8150A6B0270; Tue, 26 Jun 2018 09:15:50 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7CBC56B0271; Tue, 26 Jun 2018 09:15:50 -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 68E3C6B0272; Tue, 26 Jun 2018 09:15:50 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr0-f197.google.com (mail-wr0-f197.google.com [209.85.128.197]) by kanga.kvack.org (Postfix) with ESMTP id 068166B0270 for ; Tue, 26 Jun 2018 09:15:50 -0400 (EDT) Received: by mail-wr0-f197.google.com with SMTP id k11-v6so7866858wrm.19 for ; Tue, 26 Jun 2018 06:15:49 -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=HVZ6yIjTM13mswNjnQk6+zabyo8SS7fb5UklqkhM58w=; b=JTT1iZmRxAG5ZltYudshmwZDeBUOUS98Ji8WjoX2Ovu6/JtX+tuCba+qGG851jSHQI UxXxCucpyIpxg6YLv94wXAgcRd6bJ0j9+pbj1yM+FXDddIiwAMrDy6ct82ZDgpSiS6D6 tz6iNI32mooaI4NiWQrn7oDdH3Rlp4Ia30z3++MPZ4wXAhAUKgkzmFmFwp4AcUB5+RDh j95ElO/pHd77h5KlaS5G2RcBcI/nMGVu0RonmIAYBVquqfo9Y5UhRSKABXD6bw4Ql6Uf uBLNoB3XBI95x/4LnwHqo0+35OZmonZ7FgAjmQKqz7nQ6lkJNrmP1PTIFChCVl1D7oll kMLA== X-Gm-Message-State: APt69E0gzd1oN2MXxqWb31ZyMDNpptB7Uuc0z03/vlZcnImYkpvX7WeL ijdbgIf1i4tSLtD/k09GX/F2NRZRKZqaYol68XZKlNqWuUaUx6XHJs6HEFi3a7haeS5vyCiZ9PC gDNVaQ7PiPWkmEVHF+yoxYFaM1ezH6VuE1SoCM3OMEPGgH2lwuXykHDiTGAnBnxds5B85gvhEjm t+lZEFcgAwIH+v9Wf9b9oJlVkTR4z0G4IbEmmuoRiIXt9ElT9gGKHiFeXYCCglwyXlY36vLaFbM MaHAeJ2qwVox4aRJT40WhKmSOsNwDRpGFtz1yDiBcGnTi3E8BcXOWhxWdTW7cHZRKoLdj8h3m67 XvTS+ocdFZt8kHYeqV5nnMhRH9fgAh0nynEIrg5WEYpQS5O3g3nVW38pRg3D0xCEpDBv8/fzznt W X-Received: by 2002:a1c:7409:: with SMTP id p9-v6mr1536727wmc.43.1530018949598; Tue, 26 Jun 2018 06:15:49 -0700 (PDT) X-Received: by 2002:a1c:7409:: with SMTP id p9-v6mr1536697wmc.43.1530018948994; Tue, 26 Jun 2018 06:15:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530018948; cv=none; d=google.com; s=arc-20160816; b=uW2LcWcbKDUTpDGi2fMawvHlcrqByzIDSbcLAA503/xZvsd5wFO4GbLEqeAFLGUl5r kO7yBP9lkn9BKIOBbt4OAROEkM6lVZtoA8szTQeWMN9wl+oEoXBlOTjTxxoBJb9bqrE4 Vjhi1DOJaY+9vNLvy38tfHwh95VN5k5tf/Frg3oirmrW9w8LWNv0yJzvc+4z3ntEon8N oLCA2FF2UpnJQbWdtbSithPQbweUKQd4nmlUR5QvjL45RpaIz9x7YLweO9BVqEjLVgA8 XelnT4dqAsYLQtQKMTZQinUjfzX3SZQbCdETmsY5n8B/GdrypWI0ok+9dHREJ73S7/pw 1JQg== 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=HVZ6yIjTM13mswNjnQk6+zabyo8SS7fb5UklqkhM58w=; b=KPz0THpw1zy+f8Ecrhrwa+aAprNHbMxi4kJ6UqH4M5TpisVo0MIvbrqp+5pWUwmJRi GwnPj4LHqgZeqfg7j6j8kfiVQFxPsgF+uqOeNo2elxYGJr85dlCIaRcqKWMqNjFmBs4a pGWb6+ZbvatEwaGhU/QJ7RWstRra4d5OraP1UpV7bbJ8TyTLu8IOAizjhdc2fuzhPenK pKavDtKVkA/GtlTtjOlsfMJ2Dj9mqEcYS5aEnKSS0KstOJM77YmSsdm1ZVYJ3UVPI8kv 7240dvnhmHMUiZ2SYOk3Wv0r/AJun8dWNG5u2LTv3gHAYpPJvIpMqAs1Js0YFTcF11Ho M9tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="K0T/BGtT"; 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 k202-v6sor531267wmg.88.2018.06.26.06.15.48 for (Google Transport Security); Tue, 26 Jun 2018 06:15:48 -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="K0T/BGtT"; 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=HVZ6yIjTM13mswNjnQk6+zabyo8SS7fb5UklqkhM58w=; b=K0T/BGtTWmwZIbXc0p7bznJ2J1hlkZXaH4Na6xLHuqk3/fvwfKwCuSFhGdI+We10Qm FBzoOkizeuy6DDOVYS71GGrq3NDkoqMMtkOBWyJAvD+9Dl9j34GnaTto7tqDxuB41zVj 14W6fsFQiWjKP0Z5lkERDCdurq1mmgoYrRjEbnX14OmMd1BevlI5zYPzLXzfEgJ7f3Tp iOc5qRaVsBgNxfwQs6IRlIj5ol3KoZGMfvVhTM06DKRaSSTP+Dfm0c52lX+VH5X0BpkY hi801AoIZdfrhkGBjCDv5mkztBDUJfP4Sw5P1JxkNe8kb7ym7PfBTXi4/bc1ke6Ms4oq K5Hg== X-Google-Smtp-Source: AAOMgpcuL71s6ITvRElHRCV0fhXpbdNKVTBvRFWyz74HHMzJAqrfEwh7IMXX26xQEeCg/QmJNqgXZA== X-Received: by 2002:a1c:d388:: with SMTP id k130-v6mr1588299wmg.66.1530018947902; Tue, 26 Jun 2018 06:15:47 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id w15-v6sm2162639wrn.25.2018.06.26.06.15.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 06:15:46 -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 , Andrey Konovalov Subject: [PATCH v4 08/17] khwasan, arm64: fix up fault handling logic Date: Tue, 26 Jun 2018 15:15:18 +0200 Message-Id: <9f3e30f8144682c989bbf9fdac081501258a0b06.1530018818.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.rc2.346.g013aa6912e-goog In-Reply-To: References: 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;