Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751509AbaK0QBd (ORCPT ); Thu, 27 Nov 2014 11:01:33 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:26919 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750906AbaK0QB2 (ORCPT ); Thu, 27 Nov 2014 11:01:28 -0500 X-AuditID: cbfec7f5-b7fc86d0000066b7-82-54774ad65903 From: Andrey Ryabinin To: Andrew Morton Cc: Andrey Ryabinin , Dmitry Vyukov , Konstantin Serebryany , Dmitry Chernenkov , Andrey Konovalov , Yuri Gribov , Konstantin Khlebnikov , Sasha Levin , Christoph Lameter , Joonsoo Kim , Dave Hansen , Andi Kleen , "H. Peter Anvin" , x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 04/12] mm: page_alloc: add kasan hooks on alloc and free paths Date: Thu, 27 Nov 2014 19:00:48 +0300 Message-id: <1417104057-20335-5-git-send-email-a.ryabinin@samsung.com> X-Mailer: git-send-email 2.1.3 In-reply-to: <1417104057-20335-1-git-send-email-a.ryabinin@samsung.com> References: <1404905415-9046-1-git-send-email-a.ryabinin@samsung.com> <1417104057-20335-1-git-send-email-a.ryabinin@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPLMWRmVeSWpSXmKPExsVy+t/xa7rXvcpDDPZ2M1ps+/WIzeL33pms FnPWr2GzOHLtO7vF9W9vGC0+vXzAaPH84UN2iwkP29gtpm0Ut1jZ3cxmsf3ZWyaLlZ0PWC0u 75rDZnFvzX9Wi8VHbjNbvHs2mdnix4bHrA6CHvN3fmT02DnrLrvHgk2lHov3vGTy2LSqk81j 06dJ7B5db68weZyY8ZvF48mV6UweH5/eYvHo27KK0ePzJjmPEy1fWAN4o7hsUlJzMstSi/Tt ErgyFrzbylzwWbXiXvMdxgbGRfJdjJwcEgImEt9+n2WHsMUkLtxbz9bFyMUhJLCUUWJC6zFW CKePSWJlTwcjSBWbgJ7Ev1nb2UBsEQFdiVXPdzGDFDEL7GaRWPFoBzNIQlggWOLY1T1gY1kE VCXmXP7HAmLzCrhJbNl3jKmLkQNonZzE1nXeIGFOAXeJ9vPfGCGWNTFKtLRfY5nAyLuAkWEV o2hqaXJBcVJ6rpFecWJucWleul5yfu4mRkgkfN3BuPSY1SFGAQ5GJR5ehltlIUKsiWXFlbmH GCU4mJVEeJtsy0OEeFMSK6tSi/Lji0pzUosPMTJxcEo1MJ6eWmb15t2fSYmFN8/NuiCdOS1W rEO1f1dA1uLqc/OfRn83nrp6aefVo73//iUUdATkqXcsiPGcIvtdwvb5rL8f5R8HPL7dOXnH 92cGwV4h0nP+F1bsjpy0Q3XGHJ/r0xVPma46maO3Zv9V1u1bd3242G1+ijlqfptU9fT7Rxya TOyCfuvFe/1WYinOSDTUYi4qTgQAVCu8vmICAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add kernel address sanitizer hooks to mark allocated page's addresses as accessible in corresponding shadow region. Mark freed pages as inaccessible. Signed-off-by: Andrey Ryabinin --- include/linux/kasan.h | 6 ++++++ mm/compaction.c | 2 ++ mm/kasan/kasan.c | 14 ++++++++++++++ mm/kasan/kasan.h | 1 + mm/kasan/report.c | 7 +++++++ mm/page_alloc.c | 3 +++ 6 files changed, 33 insertions(+) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 01c99fe..9714fba 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -30,6 +30,9 @@ static inline void kasan_disable_local(void) void kasan_unpoison_shadow(const void *address, size_t size); +void kasan_alloc_pages(struct page *page, unsigned int order); +void kasan_free_pages(struct page *page, unsigned int order); + #else /* CONFIG_KASAN */ static inline void kasan_unpoison_shadow(const void *address, size_t size) {} @@ -37,6 +40,9 @@ static inline void kasan_unpoison_shadow(const void *address, size_t size) {} static inline void kasan_enable_local(void) {} static inline void kasan_disable_local(void) {} +static inline void kasan_alloc_pages(struct page *page, unsigned int order) {} +static inline void kasan_free_pages(struct page *page, unsigned int order) {} + #endif /* CONFIG_KASAN */ #endif /* LINUX_KASAN_H */ diff --git a/mm/compaction.c b/mm/compaction.c index 546e571..12f2c7d 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -16,6 +16,7 @@ #include #include #include +#include #include "internal.h" #ifdef CONFIG_COMPACTION @@ -61,6 +62,7 @@ static void map_pages(struct list_head *list) list_for_each_entry(page, list, lru) { arch_alloc_page(page, 0); kernel_map_pages(page, 1, 1); + kasan_alloc_pages(page, 0); } } diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c index f77be01..b336073 100644 --- a/mm/kasan/kasan.c +++ b/mm/kasan/kasan.c @@ -247,6 +247,20 @@ static __always_inline void check_memory_region(unsigned long addr, kasan_report(addr, size, write); } +void kasan_alloc_pages(struct page *page, unsigned int order) +{ + if (likely(!PageHighMem(page))) + kasan_unpoison_shadow(page_address(page), PAGE_SIZE << order); +} + +void kasan_free_pages(struct page *page, unsigned int order) +{ + if (likely(!PageHighMem(page))) + kasan_poison_shadow(page_address(page), + PAGE_SIZE << order, + KASAN_FREE_PAGE); +} + void __asan_load1(unsigned long addr) { check_memory_region(addr, 1, false); diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 6da1d78..2a6a961 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -6,6 +6,7 @@ #define KASAN_SHADOW_SCALE_SIZE (1UL << KASAN_SHADOW_SCALE_SHIFT) #define KASAN_SHADOW_MASK (KASAN_SHADOW_SCALE_SIZE - 1) +#define KASAN_FREE_PAGE 0xFF /* page was freed */ #define KASAN_SHADOW_GAP 0xF9 /* address belongs to shadow memory */ struct access_info { diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 56a2089..8ac3b6b 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -57,6 +57,9 @@ static void print_error_description(struct access_info *info) case 0 ... KASAN_SHADOW_SCALE_SIZE - 1: bug_type = "out of bounds access"; break; + case KASAN_FREE_PAGE: + bug_type = "use after free"; + break; case KASAN_SHADOW_GAP: bug_type = "wild memory access"; break; @@ -78,6 +81,10 @@ static void print_address_description(struct access_info *info) page = virt_to_head_page((void *)info->access_addr); switch (shadow_val) { + case KASAN_FREE_PAGE: + dump_page(page, "kasan error"); + dump_stack(); + break; case KASAN_SHADOW_GAP: pr_err("No metainfo is available for this access.\n"); dump_stack(); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0b2f5a6..4ea0e33 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -804,6 +805,7 @@ static bool free_pages_prepare(struct page *page, unsigned int order) trace_mm_page_free(page, order); kmemcheck_free_shadow(page, order); + kasan_free_pages(page, order); if (PageAnon(page)) page->mapping = NULL; @@ -982,6 +984,7 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags) arch_alloc_page(page, order); kernel_map_pages(page, 1 << order, 1); + kasan_alloc_pages(page, order); if (gfp_flags & __GFP_ZERO) prep_zero_page(page, order, gfp_flags); -- 2.1.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/