From patchwork Tue May 8 17:21:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10386647 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 51F50602C2 for ; Tue, 8 May 2018 17:22:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E8F5290B3 for ; Tue, 8 May 2018 17:22:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 31821290B9; Tue, 8 May 2018 17:22:15 +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 57424290B3 for ; Tue, 8 May 2018 17:22:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C8A036B02D8; Tue, 8 May 2018 13:21:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C61D86B02DB; Tue, 8 May 2018 13:21:45 -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 B009D6B02DC; Tue, 8 May 2018 13:21:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr0-f199.google.com (mail-wr0-f199.google.com [209.85.128.199]) by kanga.kvack.org (Postfix) with ESMTP id 535E66B02D8 for ; Tue, 8 May 2018 13:21:45 -0400 (EDT) Received: by mail-wr0-f199.google.com with SMTP id g7-v6so22230221wrb.19 for ; Tue, 08 May 2018 10:21:45 -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:in-reply-to:references; bh=WxTOEBx4FXQOPjleNHHMRe1GUaKfRs7dEFiIBmVN9Qc=; b=PDNpCmFJNQIi+dW91nLSPDCVF5OSBXH9w8HMHU37chyktEBOQ04QWNhztCD3wWHW1D dxpbC/xVNA8il8UHUX3zgzToc0v1xJzVHZ9xFD/Rheb9XKauEZPP7diIPWLTiU6un3nJ f4fApdGmvfFYcjtmZkY5tZQW52FlxtIKyxzVyuK5HQCSRUtBNVu4xFSfhT8KmaiAB4RI IbG44WSrzm2Ld09yNQp/kbNVMTCFC/hWz1meyCAV73FQN7tA8fmU/foWgfNY6FQISXws /Xg8ItKKJebGj3U7j0qzPXZ7l0g2JZP0uvGBGoRVdG59+QIeyYDmX4r/lAwP/5HBqmVa Lrew== X-Gm-Message-State: ALQs6tAJTqM6XAVCiLB788i4Skoy240+lKaGZGQDhH/dolvegMJz3RKF w3ZejjN1byjBjcIrsTubM40yYeQbXQbSsY0WHSFvu7l8kfDczqmTPmqoDQ0NG1Jlrch6fEtWuEN e1PN76c1lc4qeLl9Fpg/Z0DrVAmQWZnBK+LJgFhfxcLP63t4xZvDqyTyv7KYpKsUFkQu1grIMtm sJb7a6lhQL2z3o/9s8AWwGzrRgkllslgWsWoJRDc7tgRZKdx9KvpM1IK2vm1Ert/9xNW52ETBFC cG/pgu5Bqfm0VsNSXg8v+3y9pfUMsr8bFPkWGWiVLtC7yxBhqV8IDp7Ow9aR6UhKIfilQMmpuCj Esz3pAvgEdSLfk0W/6hEHUcKnOM14l/k34jVNUw1GqFQ6PCz2YSBy1bgRN1mtiCENsptrRtIX/T P X-Received: by 2002:adf:c358:: with SMTP id e24-v6mr33304934wrg.86.1525800104882; Tue, 08 May 2018 10:21:44 -0700 (PDT) X-Received: by 2002:adf:c358:: with SMTP id e24-v6mr33304868wrg.86.1525800103938; Tue, 08 May 2018 10:21:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525800103; cv=none; d=google.com; s=arc-20160816; b=pBtMxfEMoIfbtqqa1BYTIwkGyZ1OXcgIPmCsKc2VLXUEBcEaEStU4dv3BneAE4+oSx 4Rpbi2CpnQDiKviMv1xYh5qiEI1I8NT7FBTNVLizRVAjV0IlAxIRbUFqcQ6HAhfb6ive XTBupC5x3jcvPB88BxRPfqwiYXWPGhF92V3ThYwH+0xFU+yf/jTlGKKGd2E3R0XfW527 8RxqAYYTa3V1WaX676+FrvBwfsb8wUgL0lXI/Pejkp0cvT8gdDmtv5Y1FFsEmgKY8FcA jGKfLJWfonKIposJlvrZsSN355P/nYdc2/yDVp7yYBqv7ES7y6f8GjFOqHL25eph6McY KpiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=WxTOEBx4FXQOPjleNHHMRe1GUaKfRs7dEFiIBmVN9Qc=; b=GAAi9BcYdbHv6MeZ3hZA5PIC8l4HwMyHfbQa8+Y58CDw7825elZXgWy6UG2KA3pvl0 u0gXCKQBe+kUzPGMypv8FkNRKmFLNVeR4e0JOZ6M9zB2iVk0Ydk6otDkRafiSMXTzXLv fIsy7JegOCrainIHU6NSo1BrkM8yKYOoP2zO3FIRxJYqTXXKfNO8pRlJX2jW8CRPX795 QfvegARkSCEgFm0Unf1bVxvHl+jiu3OoThtgX60VG6NcuF0/JUgm3+cHmJfhIcPt9RpM GK5MhPArrscPhkOnvTfLfRS3tnjpyzL4SprTQsIoa89XGQ1LUhnOwByLFvnkXIaU/ijX fMdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=aXqwr+eu; 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 h10-v6sor11606769wrf.61.2018.05.08.10.21.43 for (Google Transport Security); Tue, 08 May 2018 10:21:43 -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=aXqwr+eu; 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 :in-reply-to:references; bh=WxTOEBx4FXQOPjleNHHMRe1GUaKfRs7dEFiIBmVN9Qc=; b=aXqwr+euHQ/UQHrd2Dll3sahX3QlTwvm7JZKl79yIVRjtZkNYF4IjPh3twCjJOeHcJ 9nqKr+nUtMoSbDnKAlhE25u3ZWXwimFvsC61GkPhnzoFFraQRQVNKqOWVM9mSBzXc0P6 wZIjuWzICNxkNAAUc2ipvaDcECpvK8HWku9sO/gMH2C7ImooE5ac+EXKCUW2IG1Ov3bo dHSnqAy7GEYhBE+ij96CLvlRyWxGUbQVOQfPP2ltwivp3MHxvlQ0lV2gxeHNauobdX1G qb2xIcPBjbluxaReat/jNz1VexKOGPpqgYAmfdKZyVYOY27VJiXpP05Pr6C8Vi26Bhvn W+yw== X-Google-Smtp-Source: AB8JxZq+qUZ2UjijWMKDAeikV7fA8skN10L3NYQw/t47oBfE3fOfO5UIHO10/NTJc1Snhn6MalS9WA== X-Received: by 2002:adf:db0b:: with SMTP id s11-v6mr32137819wri.241.1525800102986; Tue, 08 May 2018 10:21: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 m134sm14178311wmg.4.2018.05.08.10.21.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 10:21:42 -0700 (PDT) From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Jonathan Corbet , Catalin Marinas , Will Deacon , Christopher Li , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Masahiro Yamada , Michal Marek , Andrey Konovalov , Mark Rutland , Nick Desaulniers , Yury Norov , Marc Zyngier , Kristina Martsenko , Suzuki K Poulose , Punit Agrawal , Dave Martin , Ard Biesheuvel , James Morse , Michael Weiser , Julien Thierry , Tyler Baicar , "Eric W . Biederman" , Thomas Gleixner , Ingo Molnar , Kees Cook , Sandipan Das , David Woodhouse , Paul Lawrence , Herbert Xu , Josh Poimboeuf , Geert Uytterhoeven , Tom Lendacky , Arnd Bergmann , Dan Williams , Michal Hocko , Jan Kara , Ross Zwisler , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Matthew Wilcox , "Kirill A . Shutemov" , Souptick Joarder , Hugh Dickins , Davidlohr Bueso , Greg Kroah-Hartman , Philippe Ombredanne , Kate Stewart , Laura Abbott , Boris Brezillon , Vlastimil Babka , Pintu Agarwal , Doug Berger , Anshuman Khandual , Mike Rapoport , Mel Gorman , Pavel Tatashin , Tetsuo Handa , 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 , Kees Cook , Jann Horn , Mark Brand , Chintan Pandya Subject: [PATCH v1 15/16] khwasan, mm, arm64: tag non slab memory allocated via pagealloc Date: Tue, 8 May 2018 19:21:01 +0200 Message-Id: <52d2542323262ede3510754bb07cbc1ed8c347b0.1525798754.git.andreyknvl@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog In-Reply-To: References: 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 KWHASAN doesn't check memory accesses through pointers tagged with 0xff. When page_address is used to get pointer to memory that corresponds to some page, the tag of the resulting pointer gets set to 0xff, even though the allocated memory might have been tagged differently. For slab pages it's impossible to recover the correct tag to return from page_address, since the page might contain multiple slab objects tagged with different values, and we can't know in advance which one of them is going to get accessed. For non slab pages however, we can recover the tag in page_address, since the whole page was marked with the same tag. This patch adds tagging to non slab memory allocated with pagealloc. To set the tag of the pointer returned from page_address, the tag gets stored to page->flags when the memory gets allocated. Signed-off-by: Andrey Konovalov --- arch/arm64/include/asm/memory.h | 11 +++++++++++ include/linux/mm.h | 29 +++++++++++++++++++++++++++++ include/linux/page-flags-layout.h | 10 ++++++++++ mm/cma.c | 1 + mm/kasan/common.c | 15 +++++++++++++-- mm/page_alloc.c | 1 + 6 files changed, 65 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index f206273469b5..9ec78a44c5ff 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -304,7 +304,18 @@ static inline void *phys_to_virt(phys_addr_t x) #define __virt_to_pgoff(kaddr) (((u64)(kaddr) & ~PAGE_OFFSET) / PAGE_SIZE * sizeof(struct page)) #define __page_to_voff(kaddr) (((u64)(kaddr) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page)) +#ifndef CONFIG_KASAN_HW #define page_to_virt(page) ((void *)((__page_to_voff(page)) | PAGE_OFFSET)) +#else +#define page_to_virt(page) ({ \ + unsigned long __addr = \ + ((__page_to_voff(page)) | PAGE_OFFSET); \ + if (!PageSlab((struct page *)page)) \ + __addr = KASAN_SET_TAG(__addr, page_kasan_tag(page)); \ + ((void *)__addr); \ +}) +#endif + #define virt_to_page(vaddr) ((struct page *)((__virt_to_pgoff(vaddr)) | VMEMMAP_START)) #define _virt_addr_valid(kaddr) pfn_valid((((u64)(kaddr) & ~PAGE_OFFSET) \ diff --git a/include/linux/mm.h b/include/linux/mm.h index 1ac1f06a4be6..d6d596824803 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -770,6 +770,7 @@ int finish_mkwrite_fault(struct vm_fault *vmf); #define NODES_PGOFF (SECTIONS_PGOFF - NODES_WIDTH) #define ZONES_PGOFF (NODES_PGOFF - ZONES_WIDTH) #define LAST_CPUPID_PGOFF (ZONES_PGOFF - LAST_CPUPID_WIDTH) +#define KASAN_TAG_PGOFF (LAST_CPUPID_PGOFF - KASAN_TAG_WIDTH) /* * Define the bit shifts to access each section. For non-existent @@ -780,6 +781,7 @@ int finish_mkwrite_fault(struct vm_fault *vmf); #define NODES_PGSHIFT (NODES_PGOFF * (NODES_WIDTH != 0)) #define ZONES_PGSHIFT (ZONES_PGOFF * (ZONES_WIDTH != 0)) #define LAST_CPUPID_PGSHIFT (LAST_CPUPID_PGOFF * (LAST_CPUPID_WIDTH != 0)) +#define KASAN_TAG_PGSHIFT (KASAN_TAG_PGOFF * (KASAN_TAG_WIDTH != 0)) /* NODE:ZONE or SECTION:ZONE is used to ID a zone for the buddy allocator */ #ifdef NODE_NOT_IN_PAGE_FLAGS @@ -802,6 +804,7 @@ int finish_mkwrite_fault(struct vm_fault *vmf); #define NODES_MASK ((1UL << NODES_WIDTH) - 1) #define SECTIONS_MASK ((1UL << SECTIONS_WIDTH) - 1) #define LAST_CPUPID_MASK ((1UL << LAST_CPUPID_SHIFT) - 1) +#define KASAN_TAG_MASK ((1UL << KASAN_TAG_WIDTH) - 1) #define ZONEID_MASK ((1UL << ZONEID_SHIFT) - 1) static inline enum zone_type page_zonenum(const struct page *page) @@ -1021,6 +1024,32 @@ static inline bool cpupid_match_pid(struct task_struct *task, int cpupid) } #endif /* CONFIG_NUMA_BALANCING */ +#ifdef CONFIG_KASAN_HW +static inline u8 page_kasan_tag(const struct page *page) +{ + return (page->flags >> KASAN_TAG_PGSHIFT) & KASAN_TAG_MASK; +} + +static inline void page_kasan_tag_set(struct page *page, u8 tag) +{ + page->flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT); + page->flags |= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT; +} + +static inline void page_kasan_tag_reset(struct page *page) +{ + page_kasan_tag_set(page, 0xff); +} +#else +static inline u8 page_kasan_tag(const struct page *page) +{ + return 0xff; +} + +static inline void page_kasan_tag_set(struct page *page, u8 tag) { } +static inline void page_kasan_tag_reset(struct page *page) { } +#endif + static inline struct zone *page_zone(const struct page *page) { return &NODE_DATA(page_to_nid(page))->node_zones[page_zonenum(page)]; diff --git a/include/linux/page-flags-layout.h b/include/linux/page-flags-layout.h index 7ec86bf31ce4..8dbad17664c2 100644 --- a/include/linux/page-flags-layout.h +++ b/include/linux/page-flags-layout.h @@ -82,6 +82,16 @@ #define LAST_CPUPID_WIDTH 0 #endif +#ifdef CONFIG_KASAN_HW +#define KASAN_TAG_WIDTH 8 +#if SECTIONS_WIDTH+NODES_WIDTH+ZONES_WIDTH+LAST_CPUPID_WIDTH+KASAN_TAG_WIDTH \ + > BITS_PER_LONG - NR_PAGEFLAGS +#error "KASAN: not enough bits in page flags for tag" +#endif +#else +#define KASAN_TAG_WIDTH 0 +#endif + /* * We are going to use the flags for the page to node mapping if its in * there. This includes the case where there is no node, so it is implicit. diff --git a/mm/cma.c b/mm/cma.c index aa40e6c7b042..f657db289bba 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -526,6 +526,7 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, } trace_cma_alloc(pfn, page, count, align); + page_kasan_tag_reset(page); if (ret && !(gfp_mask & __GFP_NOWARN)) { pr_err("%s: alloc failed, req-size: %zu pages, ret: %d\n", diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 0654bf97257b..7cd4a4e8c3be 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -207,8 +207,18 @@ void kasan_unpoison_stack_above_sp_to(const void *watermark) void kasan_alloc_pages(struct page *page, unsigned int order) { +#ifdef CONFIG_KASAN_GENERIC if (likely(!PageHighMem(page))) kasan_unpoison_shadow(page_address(page), PAGE_SIZE << order); +#else + if (!PageSlab(page)) { + u8 tag = random_tag(); + + kasan_poison_shadow(page_address(page), PAGE_SIZE << order, + tag); + page_kasan_tag_set(page, tag); + } +#endif } void kasan_free_pages(struct page *page, unsigned int order) @@ -433,6 +443,7 @@ void *kasan_kmalloc_large(const void *ptr, size_t size, gfp_t flags) #else tag = random_tag(); kasan_poison_shadow(ptr, redzone_start - (unsigned long)ptr, tag); + page_kasan_tag_set(page, tag); #endif kasan_poison_shadow((void *)redzone_start, redzone_end - redzone_start, KASAN_PAGE_REDZONE); @@ -462,7 +473,7 @@ void kasan_poison_kfree(void *ptr, unsigned long ip) page = virt_to_head_page(ptr); if (unlikely(!PageSlab(page))) { - if (reset_tag(ptr) != page_address(page)) { + if (ptr != page_address(page)) { kasan_report_invalid_free(ptr, ip); return; } @@ -475,7 +486,7 @@ void kasan_poison_kfree(void *ptr, unsigned long ip) void kasan_kfree_large(void *ptr, unsigned long ip) { - if (reset_tag(ptr) != page_address(virt_to_head_page(ptr))) + if (ptr != page_address(virt_to_head_page(ptr))) kasan_report_invalid_free(ptr, ip); /* The object will be poisoned by page_alloc. */ } diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 905db9d7962f..54df9c852c6e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1179,6 +1179,7 @@ static void __meminit __init_single_page(struct page *page, unsigned long pfn, init_page_count(page); page_mapcount_reset(page); page_cpupid_reset_last(page); + page_kasan_tag_reset(page); INIT_LIST_HEAD(&page->lru); #ifdef WANT_PAGE_VIRTUAL