Message ID | 1324a622035ee2a6fecd1e729a62af22542d9f3e.1537542735.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 9E09E17EE for <patchwork-linux-mm@patchwork.kernel.org>; Fri, 21 Sep 2018 15:14:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DD88289A2 for <patchwork-linux-mm@patchwork.kernel.org>; Fri, 21 Sep 2018 15:14:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 808CE2E46A; Fri, 21 Sep 2018 15:14:18 +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 0BE782E46D for <patchwork-linux-mm@patchwork.kernel.org>; Fri, 21 Sep 2018 15:14:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 396328E0033; Fri, 21 Sep 2018 11:14:01 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 31B548E0030; Fri, 21 Sep 2018 11:14:01 -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 1249F8E0033; Fri, 21 Sep 2018 11:14:01 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by kanga.kvack.org (Postfix) with ESMTP id 9A08E8E0030 for <linux-mm@kvack.org>; Fri, 21 Sep 2018 11:14:00 -0400 (EDT) Received: by mail-wm1-f70.google.com with SMTP id 129-v6so2630164wma.8 for <linux-mm@kvack.org>; Fri, 21 Sep 2018 08:14:00 -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=m233AnC4qvrdV4eo3QzdNfMFrtQI7a9l1G83xPQzcRQ=; b=W/slEt/hX+dvD2vRksgGH2UC3dOjnTYMhk/BBVNpGg9hEdvAXxwP6LSltMvilWjQeO 7rLB7ZIhBsJO1TP3ag6FlCIYEH4UZsR1OHx+KqjT9LuAIdWL9FQLQbHe/2e/WDt3jFvf JBOBVkxeTXqrcPhkRwQk5ShoNCp47qttRQgmXpKph1c42ktX6p5GpR2jQivDulHhmMI9 fGrZQukQmp5Md65H0Eh5fcG+tFQCCuaYfelAK5M1v/Y/umVa5j0hvwK/aAIP9Uo4pVyW V9tHthqSaLtk+XY9pYJR11Cw887Ah7G+7CxxsFirm2kIoQ/IdaGCtKuERNhiQc8t8Ebn lTkA== X-Gm-Message-State: APzg51BmOE9riKeRl0vvIW0egnpekCbopYuDt+rEKT6hlkx/kT+QYYu+ s2n7d3Pofl3sCjE7NCf41Y+8tZZV2Wub//4GvfSF7CmjpjsGXm1y8ZWc303r8qLI43so5Wk9mhC F/hGVk6tl3ieXN0LdhdCJKS6Mylr7Z2TRp7ZUuIJq+ydrcGs21s5OlsFwC+0pcfLM/Q/1AqGSOa EfynSygdfwAv0f/QG0+xG2G8m1YhX2Q/W+h4aUe0C1CifxjNC+z5r343B6RbjCZaFWKg8OXtaIM xXo9DcQzuZ6fNCXF1NDRMryEgS6w1fu3+QR2+oYjOr4AlxXO3TP07tJD1RUcXldBAi5Xg6u5i5x xh/nbd2v4UcVTF9y8QdR3tLmIYQvGWyJO0wiAHx6G0oOVZ9CBpSqsOfbH7l7axMGPB5dEwlvcoU I X-Received: by 2002:a7b:c10c:: with SMTP id w12-v6mr8011679wmi.132.1537542840099; Fri, 21 Sep 2018 08:14:00 -0700 (PDT) X-Received: by 2002:a7b:c10c:: with SMTP id w12-v6mr8011585wmi.132.1537542838957; Fri, 21 Sep 2018 08:13:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537542838; cv=none; d=google.com; s=arc-20160816; b=kjrjl5WbSfDtXQyDn3wXlZk9ze+rQEykViVTT+AVPmK3VnKl5zk7435U+BVjSzkzcx SDn7/g6JeHse/ur86XJLaBq0bQ0RGhLpWSvP+IKmvf1wjssHZVeH19K4/SZ//OMvWBXo LNvuvQnGC7AaJuAb8FKLdLaoMazCS3NULLr3EG72krIBYbEpxjqLak9zIJme3gRdz8Kw q0Rq5gMBefnleQgHi05IxEUzQEF7UIAwMYZAQ/YmLx12qtwRVgoFt8AOmB6wr2gxl2M/ 79eQJoK7jM5JiLyOc6IwvavEi6+drnOHdS5nvAIMkiqnPyY2QCntCXxkQ4gIOeF4LQz5 coiA== 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=m233AnC4qvrdV4eo3QzdNfMFrtQI7a9l1G83xPQzcRQ=; b=R3yZNmIpxU41B72eczsUjp+0VCMTd/AUacy5QaS154W2Pd+sieH7tWOYIQLUZoGELI AEzXQgnP6tLrguY2GDFG0Vuk5Mkn9eEha5BZHPBvs43AkIGWVriY62tLxDiIIQJw4zcV KHqWJjWKA4VvGH3SvtjRxI6Bs//8Per9QoSYrkv2lk4hVE2poR/+L5Uhmpn8X4Agkcyx XiLKNhnmMmIvs5pAKcZFzw5SNj67YB/SNM1mTZKZgr1ee0ElomCHx089MW3MTDO9erT4 VLdc8kTk9Q7FY67vKyq/2v/5/197X/H/e0sHxrVnXIfLSSYkNZYpr7RlU931dphk0nLV 2TDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=eXnNKEPH; 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-v6sor20956137wrd.41.2018.09.21.08.13.58 for <linux-mm@kvack.org> (Google Transport Security); Fri, 21 Sep 2018 08:13:58 -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=eXnNKEPH; 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=m233AnC4qvrdV4eo3QzdNfMFrtQI7a9l1G83xPQzcRQ=; b=eXnNKEPHitQJezi0vHtHIhgtf1+Nu76xnakGrrSIlmxQYrEomHDWnSPKQZv2RBaMyg DfOVVg7EW8nVvRheW/vPQsiupWVv3evsdHoJRSqZc5ljRyWpJPE9tFdyKd5RY7/gEjsf Bo9WOBw2fmhd1oljcXXeQgEpPVkER26e6mZUo021V6Dlc4TrtV542wIpdX1hwq2n1yWg A1wHs5iM0blg0U9U5JZfWUVL3DgRODcMiXnIJK/FzsWXwjYpVDteD/5/1twuScg+5ilL qdeYlxvgCjApJidVANb5pXkm6j00YzJAnSB/ACTkn+5l0LVYlZeh0KIpEQ5r1osMg3rK 6eFQ== X-Google-Smtp-Source: ANB0VdZ/7B03zuJhdFK5x1o9/rEePSk4KohCAM1ihTBVIsTurv5K1v1r00w6vlR1FCprWMkvVK1lhQ== X-Received: by 2002:adf:9244:: with SMTP id 62-v6mr35901684wrj.62.1537542838400; Fri, 21 Sep 2018 08:13:58 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id e7-v6sm27990271wru.46.2018.09.21.08.13.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Sep 2018 08:13:57 -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 v9 07/20] kasan, arm64: untag address in __kimg_to_phys and _virt_addr_is_linear Date: Fri, 21 Sep 2018 17:13:29 +0200 Message-Id: <1324a622035ee2a6fecd1e729a62af22542d9f3e.1537542735.git.andreyknvl@google.com> X-Mailer: git-send-email 2.19.0.444.g18242da7ef-goog In-Reply-To: <cover.1537542735.git.andreyknvl@google.com> References: <cover.1537542735.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 |
kasan: add software tag-based mode for arm64
|
expand
|
diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 0f1e024a951f..3226a0218b0b 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -92,6 +92,15 @@ #define KASAN_THREAD_SHIFT 0 #endif +#ifdef CONFIG_KASAN_SW_TAGS +#define KASAN_TAG_SHIFTED(tag) ((unsigned long)(tag) << 56) +#define KASAN_SET_TAG(addr, tag) (((addr) & ~KASAN_TAG_SHIFTED(0xff)) | \ + KASAN_TAG_SHIFTED(tag)) +#define KASAN_RESET_TAG(addr) KASAN_SET_TAG(addr, 0xff) +#else +#define KASAN_RESET_TAG(addr) addr +#endif + #define MIN_THREAD_SHIFT (14 + KASAN_THREAD_SHIFT) /* @@ -232,7 +241,7 @@ static inline unsigned long kaslr_offset(void) #define __is_lm_address(addr) (!!((addr) & BIT(VA_BITS - 1))) #define __lm_to_phys(addr) (((addr) & ~PAGE_OFFSET) + PHYS_OFFSET) -#define __kimg_to_phys(addr) ((addr) - kimage_voffset) +#define __kimg_to_phys(addr) (KASAN_RESET_TAG(addr) - kimage_voffset) #define __virt_to_phys_nodebug(x) ({ \ phys_addr_t __x = (phys_addr_t)(x); \ @@ -308,7 +317,8 @@ static inline void *phys_to_virt(phys_addr_t x) #endif #endif -#define _virt_addr_is_linear(kaddr) (((u64)(kaddr)) >= PAGE_OFFSET) +#define _virt_addr_is_linear(kaddr) (KASAN_RESET_TAG((u64)(kaddr)) >= \ + PAGE_OFFSET) #define virt_addr_valid(kaddr) (_virt_addr_is_linear(kaddr) && \ _virt_addr_valid(kaddr))
__kimg_to_phys (which is used by virt_to_phys) and _virt_addr_is_linear (which is used by virt_addr_valid) assume that the top byte of the address is 0xff, which isn't always the case with tag-based KASAN. This patch resets the tag in those macros. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- arch/arm64/include/asm/memory.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)