Message ID | 4da4495dc20525db1654d3dd9d578b7965d98507.1535462971.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-2.web.codeaurora.org (Postfix) with ESMTP id 7C4E31709 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 29 Aug 2018 11:36:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C6A92AA9C for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 29 Aug 2018 11:36:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F48C2AB91; Wed, 29 Aug 2018 11:36:00 +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 EB77C2AA9C for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 29 Aug 2018 11:35:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F5726B4B83; Wed, 29 Aug 2018 07:35:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4CE176B4B84; Wed, 29 Aug 2018 07:35:44 -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 3989D6B4B85; Wed, 29 Aug 2018 07:35:44 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by kanga.kvack.org (Postfix) with ESMTP id CC84D6B4B83 for <linux-mm@kvack.org>; Wed, 29 Aug 2018 07:35:43 -0400 (EDT) Received: by mail-wr1-f72.google.com with SMTP id o43-v6so3276004wrf.10 for <linux-mm@kvack.org>; Wed, 29 Aug 2018 04:35:43 -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=/C7rrwe4N6BQx9M4EE8DtUTnDGQn+bG0YjkQ0aHndSs=; b=SsXo6CMLeUlsJthi1dPkDLmJtVGP7HusIZNONlTvsiyF72MSR4+Axc+5tFD8ng9lb7 R90ESoRvQthql2KjZF5ML0ZupPlNyxYtBfNsvETP5swQ4AYiIm1nHsyRWXf7e9qZocL5 S5Lis3HxRWZd6/U+Ea6wEBagXjkhFnf4k9XY6PZlpfxcUHTZUKEUVvQ8YS0CP3FMXZtM 6Y+dD5/EvUzwmaxWHoxmzwbl+OXv+p7KIf9its6pQ4NL+h82qqWVYyL+wNIfXBYjqNRG DLrL6IyJxtFFskasPxngOJUJjYbhhyn+GFBqkJoS+xuQq0vdi6Uj+ekX2MU8EqBTGN4S XfaA== X-Gm-Message-State: APzg51DDzEfhjFzooitx8+g01QFsd4itWz6Vqj3q011uZmkrAoMxhvsn 1P2SUX0SoCgzEtuXk/LvYqu2pI5TOA38pFsz4Be11jcNU1lntAKTABlxfLDyu1asJwHq+tAlrFX ZFNG2D8Ir3GVMnJmLxuLNJ/k0WcMs5ybRrhuEljvkGFgC69k9TP9Ihx5tgOxFMIZp+1fMTSNix9 7q4VoYs964HdbBFQrjeSWCDG6F7FzfoMHpD/YB0mj/odIIBVcIFmcGoJbpOfb4cXnH0iv0NbCMr adRbEk+sAcfB2TDkF7vYAGYU0izcrRA7xu2MVSQGnJmDmfI/YjCXYZW4LigNC/SKoI/0IZI8HuE SeV+ZLy6uc0r4+1aUaj7llh4osr46sU935fwW36fXZP+RGHAVmNz927EvxoB57xsXFlKyeDX6Vg x X-Received: by 2002:adf:f84b:: with SMTP id d11-v6mr3952449wrq.172.1535542543379; Wed, 29 Aug 2018 04:35:43 -0700 (PDT) X-Received: by 2002:adf:f84b:: with SMTP id d11-v6mr3952423wrq.172.1535542542694; Wed, 29 Aug 2018 04:35:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535542542; cv=none; d=google.com; s=arc-20160816; b=qKJjx/RNATb3HDub/vy0Vk2zuJ//Jd5Tt31VB2QmznU4Kk+jGF61LfioVwCpvkEZGi HzGQUBfP8qS6F7hRlgTFdY6xDyvZY/+JcIwf6nH7YArnytN0143CAvITA/wVUDhuksT7 dDO10fIGq+YDmBE+YcaBG/rgjrUgyun4In4+Zya+jFKkbPpMFyPEpKk/7zGqVDaB51DL o3tyaaNHbYndI7dtXA7TOf0FiYAW/29Yqwi7lUGRSO056J6Y0pXWB9GHS6HjxPae9vkT htRNlrDbaiRKQP+Je18sDQ2AG8ShtGFIAszRGar4OCNGZxmbmelTMFityK4ll7Vqv2wY P9vQ== 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=/C7rrwe4N6BQx9M4EE8DtUTnDGQn+bG0YjkQ0aHndSs=; b=sCOefOx+xWgWZBiqoPnBlBLRkOe1eCrpD6eGDPqd7eJkQdjNzNaurxWF1z7DPNqA/2 yjEF7IPZAWHZB0y6PNiMyCMb+hU/OoQNaa/q7BxGNcqmPDaskx8donJQlSvZvEaAguoT trQtA5jId6Nj22t1wrCtuRT9LBwHEegvEV2l3lR49C964IRHVNf59XbtdBBZHrkQ+duG IingkgH6XhXGLzVwcqpVA3C60vy4QahbUrZY3j3iZLZB/Oa0MSl8TPbwVU2S7itvyEJb uklfg2+kgx8T9v7TFbBAlU28YjkXeRJVM4RfKuTi+kDOSoBGDwpZUtiEMJtrbxfWSrpO DPEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="dU/Fx2La"; 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 x5-v6sor1641082wrd.41.2018.08.29.04.35.42 for <linux-mm@kvack.org> (Google Transport Security); Wed, 29 Aug 2018 04:35:42 -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="dU/Fx2La"; 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=/C7rrwe4N6BQx9M4EE8DtUTnDGQn+bG0YjkQ0aHndSs=; b=dU/Fx2LaujUbvtHauwsP0t1aA/m2D+06oXMHwZ3eXwP1Nzw3gC8PebFtKC1EnSsH69 c0BZGLLNtAdh454C93JmrKX65W2EMHdPt55gfbxnmI6ZBwf48jJ0+K0uyUO+N5x56L61 H05vabh86vY1pFtsPWG7/c0vwk/TX9FzE/hL4njIAk0P4vbuWYNdMbg1msffocHP+j4S 02zcVCF+LR2Gffm0s0xI7A0hw2Fm44sDbs+XriYfO7scgMEmeWN4DNgjhPtc4Br6jBit X9y0Oa4JtjU3dat2ZfvzOzi9tZrU9ASdv/eeSGhQIx4BwERGx2cCYod7MNlV1snr6UJ0 XzsA== X-Google-Smtp-Source: ANB0Vdb2BlaS8zRz1NV8bmHOiV24XFb36lvecxL3punEHE/BVCiUxdBbrADrOo26tG+iGem0MA87hQ== X-Received: by 2002:adf:f608:: with SMTP id t8-v6mr4068969wrp.186.1535542542109; Wed, 29 Aug 2018 04:35:42 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id s10-v6sm7800454wmd.22.2018.08.29.04.35.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Aug 2018 04:35:41 -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>, Vishwath Mohan <vishwath@google.com>, Andrey Konovalov <andreyknvl@google.com> Subject: [PATCH v6 09/18] khwasan, arm64: fix up fault handling logic Date: Wed, 29 Aug 2018 13:35:13 +0200 Message-Id: <4da4495dc20525db1654d3dd9d578b7965d98507.1535462971.git.andreyknvl@google.com> X-Mailer: git-send-email 2.19.0.rc0.228.g281dcd1b4d0-goog In-Reply-To: <cover.1535462971.git.andreyknvl@google.com> References: <cover.1535462971.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 |
Series |
khwasan: kernel hardware assisted address sanitizer
|
expand
|
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 50b30ff30de4..35feee78a9bd 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(+)