From patchwork Wed Jun 20 17:39:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10478227 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 AF4B060383 for ; Wed, 20 Jun 2018 17:40:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99F3128D69 for ; Wed, 20 Jun 2018 17:40:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8DE6428E6C; Wed, 20 Jun 2018 17:40:26 +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 08BD828D69 for ; Wed, 20 Jun 2018 17:40:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 947606B0269; Wed, 20 Jun 2018 13:40:17 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8F9526B026A; Wed, 20 Jun 2018 13:40:17 -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 7E66B6B026B; Wed, 20 Jun 2018 13:40:17 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr0-f198.google.com (mail-wr0-f198.google.com [209.85.128.198]) by kanga.kvack.org (Postfix) with ESMTP id 23C896B0269 for ; Wed, 20 Jun 2018 13:40:17 -0400 (EDT) Received: by mail-wr0-f198.google.com with SMTP id 33-v6so249587wrb.12 for ; Wed, 20 Jun 2018 10:40:17 -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=lLfYi37gaM0avQflOOXqZqRn7bz54yL74j4Bfvqwt8s=; b=uMk8AKSHS2OeqE5lcVfGrnKJN2buXehom53lG4TICa29crjdhLFtjCFJ+0luRIhyKN ISSL6ItROAycFUbmutYjCmJ/Dj+dmYgOgiCwYq2ws5ekM/xRaBPFc9x9EOSrYl8EtpLR f3wS6BgZc4WPNHEWr+FCFCRW2WiHtWNR8X20StUobTQENBPBRvKoPaOsNWvDU1BoL6xM WE14kyXkr2uAnU97ViVxpxPYkuLmCioVmORxWIR/wQH7eaITgceamf2MVco1fNaRK6xu jTxTOQiD1ScMJjFFnOK9/Hx+kJWFjSbBASd9TQhTUKPj+2f95cmcEpH+/RLighxH8iSp cZWg== X-Gm-Message-State: APt69E2wH1IBMtj7EoCR41s1hGEQpTC+lVOIl93cYtxI1LXOqbCe8+XB BGhlU1vowhmySdxQaMMukxNWOVI2UJShfGpVJcMCM/HqFdvaRZEAUmWDtGVPREqY8oX9WExvv4D lQ0lr+YBxiKv7wYwZ52o4VuU32zbuDNUwoVFDHy/X9wGSclTDcUhYFraXtzby+Yqag8g+64YzXI a/CaND94YOlcZyOstwHKHO3N+zryTBZ7GmlasbfhaQ0caBstu3Q0bwgsln+YgKA5Nq7GHrf3NrJ 5s5eG6BxT6Z313EOeDNBj/+ya0bEeeyzGrgBQnKcnvnP0jSUaHOV3PKNgH42MuKBqGHujsH6HCl 3Hfp2ckFxV68iLZpmHn8h6qHjiHmAcZL0xNeWjlNAvBKCoBu1JxhAdc+m0aj53oSC10bT3s406a / X-Received: by 2002:a1c:b211:: with SMTP id b17-v6mr2289196wmf.74.1529516416637; Wed, 20 Jun 2018 10:40:16 -0700 (PDT) X-Received: by 2002:a1c:b211:: with SMTP id b17-v6mr2289161wmf.74.1529516415686; Wed, 20 Jun 2018 10:40:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529516415; cv=none; d=google.com; s=arc-20160816; b=GASX/vSM6Q8njaci9flc1SHyK9Z+hcSmi9NDtgInqpMLnacjl1Sd8etBIE/QdwL+zV 4XjdV0nuwTq5v3eRIVBkOSBmA1wdUjrlVuyEF90Q4bfd+BktAR77aJzB6H8Nj/SCzAzq gMvQvEk6B6C0uD/1jPDw9vqERiqY6vyaznQDivlF7orwKIlPl6zXOVF/Z6OVLe+lYhf1 ooo9w99wi+K2Bw0JmCPWKl0r2sJ7hsMXDJpX62koorMEv4yEep7LPq2uuJEiHIOH9hPU sIv+P55OCKyxFh763Vq+NGz2niJpz1eoBNjaylSAIoRo5kR61nFWsRO7pI4xULV6L6lZ DHxQ== 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=lLfYi37gaM0avQflOOXqZqRn7bz54yL74j4Bfvqwt8s=; b=q73LaaNeUWHZi6tPc4NKPy67zKQGPgBsePsQdt5p6FIyoAFh9hHyVBcRjdA8CjUy/x Gqts0GsvszZfjq+rc2fe8JlGUG4UVY35zQRuKAudWukxunKIps3yBzJ1eJk7m9WyaX0T X/ThUdn2M6qkLg//YKA5Jmw+2IwlcuGbOO8CInFpNRRCGNdX2qCe336y6VUeUZ7JEGM3 C5yQa07pAv7KQeeCE40WwskKmNFo6cxWwC4HawL+bWWO3qg2nWatwNJjH4dWTNMT5eFz 4nZSBSl7vh/TgLSO665v51Vuux4iTrx2X2xMKYS9DIErVDnsi2S1UHXYy0Cmp3+oSHzO 96FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=bNv7vRVa; 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 70-v6sor948231wmw.79.2018.06.20.10.40.15 for (Google Transport Security); Wed, 20 Jun 2018 10:40:15 -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=bNv7vRVa; 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=lLfYi37gaM0avQflOOXqZqRn7bz54yL74j4Bfvqwt8s=; b=bNv7vRVaaxLGr0gCwndaM6ZM8oO/i0DMKlm/AtlSi2rNOhic4Oi9E0oro1XOFGqpHD IXBBIBHM2PVLH11bIBJZdm/p16DSN2itB7+otjGP7RxxAyoFyZBgPn1bfiSoqI+kahgb T3YCPVPkOt12qmlvX3CGBJ5+nm4GMx6ob7dNj8c1q027Az9iAGTDlydKlL6u8Vb5Ebwu v65gl7GJ59HNdGKanCk5kr94lvhyC+Jp/kQWxb9nJrnMr+eGmfKEAmy5E92TKQkgGk7n ez0feT4O77UpxK49KK1uTpCAsgOVpJAF+l6ftn0ZJbhuFN8iQcqarv6t0x1r4CU8u654 oqVw== X-Google-Smtp-Source: ADUXVKLJz9jElOdW8PoKdesAbOJxPunoe4UmBftvYga0gq4p83fjB/Oohe0VklbrYwMfHcS7pbZnzw== X-Received: by 2002:a1c:ad50:: with SMTP id w77-v6mr2599098wme.54.1529516415006; Wed, 20 Jun 2018 10:40:15 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id f18-v6sm4388598wro.1.2018.06.20.10.40.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jun 2018 10:40:14 -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 v3 05/17] khwasan: initialize shadow to 0xff Date: Wed, 20 Jun 2018 19:39:51 +0200 Message-Id: <29bf9a5e71137411b8238fb2b8535811a91adbe8.1529515183.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-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 A KHWASAN 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 KHWASAN we need to initialize shadow memory to 0xff. This commit does that. 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 6608aa9b35ac..336385baf926 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -139,6 +139,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); @@ -149,4 +151,10 @@ static inline void kasan_cache_shutdown(struct kmem_cache *cache) {} #endif /* CONFIG_KASAN_GENERIC */ +#ifdef CONFIG_KASAN_HW + +#define KASAN_SHADOW_INIT 0xFF + +#endif /* CONFIG_KASAN_HW */ + #endif /* LINUX_KASAN_H */ diff --git a/mm/kasan/common.c b/mm/kasan/common.c index e78ebeff1f4c..656baa8984c7 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;