From patchwork Wed Sep 19 18:54:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10606235 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 6F6F56CB for ; Wed, 19 Sep 2018 18:55:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6225629178 for ; Wed, 19 Sep 2018 18:55:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 554BF2AF40; Wed, 19 Sep 2018 18:55:33 +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 C2FB029178 for ; Wed, 19 Sep 2018 18:55:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B5F9E8E000C; Wed, 19 Sep 2018 14:55:15 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A97628E000A; Wed, 19 Sep 2018 14:55:15 -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 93D748E000C; Wed, 19 Sep 2018 14:55:15 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by kanga.kvack.org (Postfix) with ESMTP id 2E1068E000A for ; Wed, 19 Sep 2018 14:55:15 -0400 (EDT) Received: by mail-wr1-f71.google.com with SMTP id y32-v6so6636570wrd.19 for ; Wed, 19 Sep 2018 11:55:15 -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=fbr13c4fj47e45ylSZzn54WLgirbXAILEytxVKinDw0=; b=ZQQ0j+zqrL7NTv0y+P3Ersnx3/jCz7/xxgB99JzfafTVxLhmm5jkWYHx+gLyho0pYq T6VS8K1xDk+xGN2wC1SAYZojgwy1lxqBFlL8Li3anzUVZrsTkZ6HePWEhG+czb1VWoIm 7f39jLtFjFnQ/fVyohZKcUjS27CnqokauUvTHtvDeWcqUa8Yqb6LcoJp50tD9hUCCg03 QD7qO0SjYfSHNKpQgRAWknReUs5MevxNh9epmOy0wHmyzEDsdf2TpE3jtosSK9uUAlJ6 aTb+3EeQELh+7z9FgpynS3SwuLqW8gqXEzS/a5cc0KRLuygBQaBd1ylqRj94rdmD6mb7 C9ag== X-Gm-Message-State: APzg51CPyMKmaJtK5r2dLN6gvlzK4Lpx/u+yEBJpSvYisDWXHEcPPQaU LhmiVUowBkHBNYAbwIzrGIJgJs7Hrm2J01DGp0hJbu0MucoNT7k5/VoE3faF+yGWycmItCyOnYw eVciRxthCI2gUvsX83v1xvIYezZ/hvlh4sMqbfZIgHDsLYv+zAz29rPGBLdP3gH6FaKVMCqUSXJ oSgLhLmVhASYHZSgcPpTWoIUqtmEqMt2nDbX+XhmrgmH65HrYthOjwHJ8UckykaMRGd3NKq/6Jg c0DHu4F+xm2ES5b7pxrkP1isngWMo8ZyL9PYxwc/A78Cv/nPZRRRnXI/CCTIXeC1Nz1EQGs0quD 36CmQlr7SqnERO0ZJlh3MRhuRJnTlYesaNHtv3JjkXq1l4dLnr+pbEPzYrWKrq2MhX5jEltJWVe h X-Received: by 2002:adf:afd3:: with SMTP id y19-v6mr29716863wrd.176.1537383314706; Wed, 19 Sep 2018 11:55:14 -0700 (PDT) X-Received: by 2002:adf:afd3:: with SMTP id y19-v6mr29716820wrd.176.1537383313903; Wed, 19 Sep 2018 11:55:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537383313; cv=none; d=google.com; s=arc-20160816; b=XXiH7VyOEbaqxJxycVcCrCMLzFG/N4LSCuaqGEKVifNCNyKtao/F1YUisdtjl66maC YkrrYbNcRjv3mtgivWd58pBzsFvRs+mIQLPW86e58BNQmPQlNUDQDi9HCZl42YtWgWu8 b6WfV6iDdXc9TwXPgh5JVHNH8TCb2CRb8yrrAjd+PPRPRHxBb+g2iSXgy0xc2+oCPH2M HmIMaDx8XtV1Hkigo8MMik+gr7Tlt1laDbKuD3ASSENMp4pXg02ACdy3n+Q7lBsyroNj FkZnyo2xlL+FhqPMRXRj4M/wjguCxVpXCxYnFqfj6WmxI0veglkLNizD1lBIFDpd/sf8 DqgA== 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=fbr13c4fj47e45ylSZzn54WLgirbXAILEytxVKinDw0=; b=fawTvzLTDP+3+jpK51ERaJGqFlNmL1XjxTkYrI1lGl5ONOpIeKycvy0RSYO0rVpPgh tiBDE7eZTDH2+iCu/S+CjEPK+yQAiKcOOKCBot/UvGasKkOPgOu8J7VzT2MF0B8eYRQ4 u01BQIlx173rZH8XmKRj+SMJqoyZktTjbaGIan9hE+8G576+ODVe8AWd/BrUetij8URY Dk6HvMAUDXjICdZmWOeasJGtf30NOJhmwgW+a9lpgoUzltLaCqwGyJC/y5180Iszj8fL k+hiQWQR1PFHrRnQxULQl16sSUTKmBhj4SRfYErL8m+pSoILPjr0a8i4QAHETu7xF1k0 xPxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=BJlkoTl7; 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 p18-v6sor463501wrr.34.2018.09.19.11.55.13 for (Google Transport Security); Wed, 19 Sep 2018 11:55:13 -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=BJlkoTl7; 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=fbr13c4fj47e45ylSZzn54WLgirbXAILEytxVKinDw0=; b=BJlkoTl7DNX07411Z8gMKQZAU8fjdC7LckXv0Baa2hcOKewrzLnPGct4wlnFtiwPSz gnRmNQyCyQs5wm6hbL96VCPVFE37GVc9SXIClOxEVfSLRbFQfj7CfKtiTDwL/+Tlzg81 5wMGVa7eUKqpKQDzqPS6LIFmZMI/xA8kv8oyOce1jcwf5fn1BkAwenslIrjY80wpJysP ApQsqjtBL5oCnnDlTH2gaUBTNj/wZFG92hM1RloiA53KGOo4Z3MSiuzvIDOZwpK5UG7E 18n64L6jYKJpaoLfftbtKnlearmnt54T1LfojC+FU9GbBeJ0Rkxd2j8bY2gZPBaIzqFC ri3A== X-Google-Smtp-Source: ANB0Vda2ndFUzi6RYaDwQ1hahv/tKgAsCAZ9rE1TeNDSNIIlR3lhKDJe9CbUqZ8tKu6Nq3DfP9XRCw== X-Received: by 2002:adf:a10c:: with SMTP id o12-v6mr3930268wro.169.1537383313499; Wed, 19 Sep 2018 11:55:13 -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.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 11:55:12 -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 06/20] kasan: initialize shadow to 0xff for tag-based mode Date: Wed, 19 Sep 2018 20:54:45 +0200 Message-Id: <8344a2ecd5b7335faa095a2da765f3ddc8d929a9.1537383101.git.andreyknvl@google.com> 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 A tag-based KASAN shadow memory cell contains a memory tag, that corresponds to the tag in the top byte of the pointer, that points to that memory. The native top byte value of kernel pointers is 0xff, so with tag-based KASAN we need to initialize shadow memory to 0xff. Signed-off-by: Andrey Konovalov --- arch/arm64/mm/kasan_init.c | 16 ++++++++++++++-- include/linux/kasan.h | 8 ++++++++ mm/kasan/common.c | 3 ++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index 12145874c02b..7a31e8ccbad2 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -44,6 +44,15 @@ static phys_addr_t __init kasan_alloc_zeroed_page(int node) return __pa(p); } +static phys_addr_t __init kasan_alloc_raw_page(int node) +{ + void *p = memblock_virt_alloc_try_nid_raw(PAGE_SIZE, PAGE_SIZE, + __pa(MAX_DMA_ADDRESS), + MEMBLOCK_ALLOC_ACCESSIBLE, + node); + return __pa(p); +} + static pte_t *__init kasan_pte_offset(pmd_t *pmdp, unsigned long addr, int node, bool early) { @@ -89,7 +98,9 @@ static void __init kasan_pte_populate(pmd_t *pmdp, unsigned long addr, do { phys_addr_t page_phys = early ? __pa_symbol(kasan_zero_page) - : kasan_alloc_zeroed_page(node); + : kasan_alloc_raw_page(node); + if (!early) + memset(__va(page_phys), KASAN_SHADOW_INIT, PAGE_SIZE); next = addr + PAGE_SIZE; set_pte(ptep, pfn_pte(__phys_to_pfn(page_phys), PAGE_KERNEL)); } while (ptep++, addr = next, addr != end && pte_none(READ_ONCE(*ptep))); @@ -139,6 +150,7 @@ asmlinkage void __init kasan_early_init(void) KASAN_SHADOW_END - (1UL << (64 - KASAN_SHADOW_SCALE_SHIFT))); BUILD_BUG_ON(!IS_ALIGNED(KASAN_SHADOW_START, PGDIR_SIZE)); BUILD_BUG_ON(!IS_ALIGNED(KASAN_SHADOW_END, PGDIR_SIZE)); + kasan_pgd_populate(KASAN_SHADOW_START, KASAN_SHADOW_END, NUMA_NO_NODE, true); } @@ -235,7 +247,7 @@ void __init kasan_init(void) set_pte(&kasan_zero_pte[i], pfn_pte(sym_to_pfn(kasan_zero_page), PAGE_KERNEL_RO)); - memset(kasan_zero_page, 0, PAGE_SIZE); + memset(kasan_zero_page, KASAN_SHADOW_INIT, PAGE_SIZE); cpu_replace_ttbr1(lm_alias(swapper_pg_dir)); /* At this point kasan is fully initialized. Enable error messages */ diff --git a/include/linux/kasan.h b/include/linux/kasan.h index f0c96f08f2f1..e7162ca9d66b 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -153,6 +153,8 @@ static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } #ifdef CONFIG_KASAN_GENERIC +#define KASAN_SHADOW_INIT 0 + void kasan_cache_shrink(struct kmem_cache *cache); void kasan_cache_shutdown(struct kmem_cache *cache); @@ -163,4 +165,10 @@ static inline void kasan_cache_shutdown(struct kmem_cache *cache) {} #endif /* CONFIG_KASAN_GENERIC */ +#ifdef CONFIG_KASAN_SW_TAGS + +#define KASAN_SHADOW_INIT 0xFF + +#endif /* CONFIG_KASAN_SW_TAGS */ + #endif /* LINUX_KASAN_H */ diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 5f68c93734ba..7134e75447ff 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -473,11 +473,12 @@ int kasan_module_alloc(void *addr, size_t size) ret = __vmalloc_node_range(shadow_size, 1, shadow_start, shadow_start + shadow_size, - GFP_KERNEL | __GFP_ZERO, + GFP_KERNEL, PAGE_KERNEL, VM_NO_GUARD, NUMA_NO_NODE, __builtin_return_address(0)); if (ret) { + __memset(ret, KASAN_SHADOW_INIT, shadow_size); find_vm_area(addr)->flags |= VM_KASAN; kmemleak_ignore(ret); return 0;