From patchwork Mon Nov 19 17:26:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10689025 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 2B73614DB for ; Mon, 19 Nov 2018 17:27:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10C5329C87 for ; Mon, 19 Nov 2018 17:27:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03BEC2A2B5; Mon, 19 Nov 2018 17:27:19 +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 7D05429C87 for ; Mon, 19 Nov 2018 17:27:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F1CC6B1B85; Mon, 19 Nov 2018 12:27:09 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1CAA06B1B87; Mon, 19 Nov 2018 12:27:09 -0500 (EST) 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 044186B1B88; Mon, 19 Nov 2018 12:27:08 -0500 (EST) 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 A05266B1B85 for ; Mon, 19 Nov 2018 12:27:08 -0500 (EST) Received: by mail-wr1-f71.google.com with SMTP id z14-v6so33640376wrh.23 for ; Mon, 19 Nov 2018 09:27:08 -0800 (PST) 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=nn1bGI0lAecZVd/Nr8NjkoGpex3MA1HD9KRsJD9iBaE=; b=b3u2yQjnaZi+nXJy8PkQaS/Q0FOy6OR2F3lPRPMBcfbGBjrr9f510Y98XbSze1Hlu5 0GuK/Dc1r3+K/7mxRg6/tn8x44OAiD9AqKC9tb3sGVRP8QTMRGN7LNsZnC72BFio871W FQwwcvF0CeKD883NONrz5zL/HSOmB0/+IN5UjjjqrKHszSrT4PWagr7/i65+vRuZ//X9 IxWPolMaUsjD+sywhUTocrWTh/zxHicrXRHFoZ13feqlaFVGDcQevYr9M7DHXpI82ztg WkyM4bbOA6M5HiUUvWItYy7MCJrJSmLrDp7vvq3LCwJbZuAMn6iW9jEQmwMshAXZGyzl AFXQ== X-Gm-Message-State: AA+aEWbOKdOwoNBvCfVQBr9SOrrQ8DjOlB/jhCOCYXtkvu3TtMmWATIw wWu8MpkvyFIJJpo/pjTa3AaHNahn3sQmy9bGt40O5a79iCcsKK8w1RxhFHrAPxToYOP99neBGof 7vd8u3HMDJqQvJaGMYs1hvyjZ2Bt7vWapnDdJGtT80vhjzsH8chRaR/V2WXjSr9pIiqAbbpqbRp /b4ohw6vIosef6ifmKjBphdmxuWMc877MMkGUVpSzHnkJUJAGMwPBQfoR8wyfAD4YlAkh6DMEgz 1pwfBPO/Bh42RSqE056pZI6tb83Sv+124G5k9qdPijSMxyo8Q6eV2KjimtBOGSKmxrfWhVfFboW 4xp/1C3UmSP4WazoOtdNzChiADHUhw6Xo382j+wnghQlctxVZXCuq1iVchHtfKt1TsQwEbkn8BJ z X-Received: by 2002:a1c:3c83:: with SMTP id j125-v6mr7630256wma.65.1542648428158; Mon, 19 Nov 2018 09:27:08 -0800 (PST) X-Received: by 2002:a1c:3c83:: with SMTP id j125-v6mr7630194wma.65.1542648427182; Mon, 19 Nov 2018 09:27:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542648427; cv=none; d=google.com; s=arc-20160816; b=VETTIp93QXRaoGKHkKfQSgS/QwCFLNtTA/CmSthfY73drOeBuafw/fTUhotdNAOfzN rWTH88M6if2GxA2ip6VXyYTRxtTuvt1esmlHeChWy+jLmsUToxxNe7WyHo+CJzTxtbag K92XOUmkxu62bgEmv2OmtuQYEPmhzThJ0SQ9db95cxmcnEgnOXUwKF+DVPlpoFl+uTor suodnEsIxCh03pto1al6P1RC+KGvUOnkaD0XiaIQqLzh5djkOhgk7fzvmhehzRO+DuU1 AYCJvhdTJiE9Hhp8Djr+nYpKwWy9UDABmHqxS3DuWVUM3MU78fUweLoNM/fGGBhE6wMn awFA== 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=nn1bGI0lAecZVd/Nr8NjkoGpex3MA1HD9KRsJD9iBaE=; b=bESSR7AdMHc3bWLdRzaQJZMBB6WBAlF29CGLiOBcbGzjPvnFZa4vI+YQCLeDCXC/tw oYqtCVb8sqLi+GWr76ZVylT1tkVzt2raFpc4vrzelYVsTVuSgKwWmcWrSkBlyVvjcVu3 w7C5nBcz8Pt851U4XkaaIRHxOiXhTnx3+anglgj9uORh6DafYeNmWXydcevqFlYwt9au SPd4O8Orcm1JRn1Kglky0GsAoDBEmf+NolMAaBT6kHRzq2ZJ0BCc7DPDipggwqwgTQDp LudhFyzxtMX1000WaktBUoNyqP9A/ekQI3OlL0MHCJxZXx38UhTH3IvvNyeyBGTW+EzV QFaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=al3YzVeC; 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 g5sor12797870wme.13.2018.11.19.09.27.07 for (Google Transport Security); Mon, 19 Nov 2018 09:27:07 -0800 (PST) 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=al3YzVeC; 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=nn1bGI0lAecZVd/Nr8NjkoGpex3MA1HD9KRsJD9iBaE=; b=al3YzVeCj0YHhNT6cg0Cjcm8u0ncAy2aMGzZTXZmBtegGLPp2r2vS/AJZTwT7SL1V1 G7ymRvAYBgYbSCnWsgyJUCkbY4M087bjjhgwKwffeoOJZkm4H5MVbig26lZWKrrpyugY laWJcgG0cgDzgtN8+NEf/Iha4W6cl+INqnjWh0rK/vi5RvWuvaAN0qJwoj7nuwHz9FO8 PX7IhcrXscvAGA8VE5Nd0vgHVsO/z9IDKSL/xCCwkBoK1bB+u0M0vt2z9yHPeByUETUh +FkaBUwb8g+m4sfCg6fphwjcewjH/c/0YrgivC2giSPSBTQYyTpIfbyOo3rG2wmlx6FG qX6A== X-Google-Smtp-Source: AFSGD/WQMm489HnpI1eyiDD7CjXlAqXEJysYrdjjAsIWTnQ1RLMBImBnpeCFI1436TFPYvZWdfHBfw== X-Received: by 2002:a1c:7601:: with SMTP id r1mr7770386wmc.98.1542648426679; Mon, 19 Nov 2018 09:27:06 -0800 (PST) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:3180:41f8:3010:ff61]) by smtp.gmail.com with ESMTPSA id l143-v6sm23685190wmb.23.2018.11.19.09.27.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 09:27:05 -0800 (PST) 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 v11 08/24] kasan: initialize shadow to 0xff for tag-based mode Date: Mon, 19 Nov 2018 18:26:24 +0100 Message-Id: <1a06035a7777dedcc93680ca739c481fb068073d.1542648335.git.andreyknvl@google.com> X-Mailer: git-send-email 2.19.1.1215.g8438c0b245-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. Reviewed-by: Andrey Ryabinin Reviewed-by: Dmitry Vyukov Signed-off-by: Andrey Konovalov --- arch/arm64/mm/kasan_init.c | 15 +++++++++++++-- include/linux/kasan.h | 8 ++++++++ mm/kasan/common.c | 3 ++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index 4ebc19422931..7a4a0904cac8 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -43,6 +43,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_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) { @@ -92,7 +101,9 @@ static void __init kasan_pte_populate(pmd_t *pmdp, unsigned long addr, do { phys_addr_t page_phys = early ? __pa_symbol(kasan_early_shadow_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))); @@ -239,7 +250,7 @@ void __init kasan_init(void) pfn_pte(sym_to_pfn(kasan_early_shadow_page), PAGE_KERNEL_RO)); - memset(kasan_early_shadow_page, 0, PAGE_SIZE); + memset(kasan_early_shadow_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 ec22d548d0d7..c56af24bd3e7 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;