From: Alexander Potapenko <glider@google.com> To: adech.fo@gmail.com, cl@linux.com, dvyukov@google.com, akpm@linux-foundation.org, ryabinin.a.a@gmail.com, rostedt@goodmis.org, iamjoonsoo.kim@lge.com, js1304@gmail.com, kcc@google.com Cc: kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v3 1/7] kasan: Modify kmalloc_large_oob_right(), add kmalloc_pagealloc_oob_right() Date: Fri, 26 Feb 2016 14:30:40 +0100 [thread overview] Message-ID: <3d20f2bc34a72acdb407a9f8b95249ed7dd9fbe3.1456492360.git.glider@google.com> (raw) In-Reply-To: <cover.1456492360.git.glider@google.com> In-Reply-To: <cover.1456492360.git.glider@google.com> Rename kmalloc_large_oob_right() to kmalloc_pagealloc_oob_right(), as the test only checks the page allocator functionality. Also reimplement kmalloc_large_oob_right() so that the test allocates a large enough chunk of memory that still does not trigger the page allocator fallback. Signed-off-by: Alexander Potapenko <glider@google.com> --- v2: - Merged "kasan: Change the behavior of kmalloc_large_oob_right" and "kasan: Changed kmalloc_large_oob_right, added kmalloc_pagealloc_oob_right" from v1 v3: - Minor description changes --- lib/test_kasan.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index c32f3b0..90ad74f 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -65,11 +65,34 @@ static noinline void __init kmalloc_node_oob_right(void) kfree(ptr); } -static noinline void __init kmalloc_large_oob_right(void) +#ifdef CONFIG_SLUB +static noinline void __init kmalloc_pagealloc_oob_right(void) { char *ptr; size_t size = KMALLOC_MAX_CACHE_SIZE + 10; + /* Allocate a chunk that does not fit into a SLUB cache to trigger + * the page allocator fallback. + */ + pr_info("kmalloc pagealloc allocation: out-of-bounds to right\n"); + ptr = kmalloc(size, GFP_KERNEL); + if (!ptr) { + pr_err("Allocation failed\n"); + return; + } + + ptr[size] = 0; + kfree(ptr); +} +#endif + +static noinline void __init kmalloc_large_oob_right(void) +{ + char *ptr; + size_t size = KMALLOC_MAX_CACHE_SIZE - 256; + /* Allocate a chunk that is large enough, but still fits into a slab + * and does not trigger the page allocator fallback in SLUB. + */ pr_info("kmalloc large allocation: out-of-bounds to right\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { @@ -324,6 +347,9 @@ static int __init kmalloc_tests_init(void) kmalloc_oob_right(); kmalloc_oob_left(); kmalloc_node_oob_right(); +#ifdef CONFIG_SLUB + kmalloc_pagealloc_oob_right(); +#endif kmalloc_large_oob_right(); kmalloc_oob_krealloc_more(); kmalloc_oob_krealloc_less(); -- 2.7.0.rc3.207.g0ac5344
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Potapenko <glider@google.com> To: adech.fo@gmail.com, cl@linux.com, dvyukov@google.com, akpm@linux-foundation.org, ryabinin.a.a@gmail.com, rostedt@goodmis.org, iamjoonsoo.kim@lge.com, js1304@gmail.com, kcc@google.com Cc: kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v3 1/7] kasan: Modify kmalloc_large_oob_right(), add kmalloc_pagealloc_oob_right() Date: Fri, 26 Feb 2016 14:30:40 +0100 [thread overview] Message-ID: <3d20f2bc34a72acdb407a9f8b95249ed7dd9fbe3.1456492360.git.glider@google.com> (raw) In-Reply-To: <cover.1456492360.git.glider@google.com> In-Reply-To: <cover.1456492360.git.glider@google.com> Rename kmalloc_large_oob_right() to kmalloc_pagealloc_oob_right(), as the test only checks the page allocator functionality. Also reimplement kmalloc_large_oob_right() so that the test allocates a large enough chunk of memory that still does not trigger the page allocator fallback. Signed-off-by: Alexander Potapenko <glider@google.com> --- v2: - Merged "kasan: Change the behavior of kmalloc_large_oob_right" and "kasan: Changed kmalloc_large_oob_right, added kmalloc_pagealloc_oob_right" from v1 v3: - Minor description changes --- lib/test_kasan.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index c32f3b0..90ad74f 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -65,11 +65,34 @@ static noinline void __init kmalloc_node_oob_right(void) kfree(ptr); } -static noinline void __init kmalloc_large_oob_right(void) +#ifdef CONFIG_SLUB +static noinline void __init kmalloc_pagealloc_oob_right(void) { char *ptr; size_t size = KMALLOC_MAX_CACHE_SIZE + 10; + /* Allocate a chunk that does not fit into a SLUB cache to trigger + * the page allocator fallback. + */ + pr_info("kmalloc pagealloc allocation: out-of-bounds to right\n"); + ptr = kmalloc(size, GFP_KERNEL); + if (!ptr) { + pr_err("Allocation failed\n"); + return; + } + + ptr[size] = 0; + kfree(ptr); +} +#endif + +static noinline void __init kmalloc_large_oob_right(void) +{ + char *ptr; + size_t size = KMALLOC_MAX_CACHE_SIZE - 256; + /* Allocate a chunk that is large enough, but still fits into a slab + * and does not trigger the page allocator fallback in SLUB. + */ pr_info("kmalloc large allocation: out-of-bounds to right\n"); ptr = kmalloc(size, GFP_KERNEL); if (!ptr) { @@ -324,6 +347,9 @@ static int __init kmalloc_tests_init(void) kmalloc_oob_right(); kmalloc_oob_left(); kmalloc_node_oob_right(); +#ifdef CONFIG_SLUB + kmalloc_pagealloc_oob_right(); +#endif kmalloc_large_oob_right(); kmalloc_oob_krealloc_more(); kmalloc_oob_krealloc_less(); -- 2.7.0.rc3.207.g0ac5344 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-02-26 13:30 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-26 13:30 [PATCH v3 0/7] SLAB support for KASAN Alexander Potapenko 2016-02-26 13:30 ` Alexander Potapenko 2016-02-26 13:30 ` Alexander Potapenko [this message] 2016-02-26 13:30 ` [PATCH v3 1/7] kasan: Modify kmalloc_large_oob_right(), add kmalloc_pagealloc_oob_right() Alexander Potapenko 2016-02-26 13:30 ` [PATCH v3 2/7] mm, kasan: SLAB support Alexander Potapenko 2016-02-26 13:30 ` Alexander Potapenko 2016-02-26 14:30 ` kbuild test robot 2016-02-26 13:30 ` [PATCH v3 3/7] mm, kasan: Added GFP flags to KASAN API Alexander Potapenko 2016-02-26 13:30 ` Alexander Potapenko 2016-02-26 13:51 ` kbuild test robot 2016-02-26 13:30 ` [PATCH v3 4/7] arch, ftrace: For KASAN put hard/soft IRQ entries into separate sections Alexander Potapenko 2016-02-26 13:30 ` Alexander Potapenko 2016-02-26 17:45 ` Steven Rostedt 2016-02-26 17:45 ` Steven Rostedt 2016-02-26 13:30 ` [PATCH v3 5/7] mm, kasan: Stackdepot implementation. Enable stackdepot for SLAB Alexander Potapenko 2016-02-26 13:30 ` Alexander Potapenko 2016-02-26 13:30 ` [PATCH v3 6/7] kasan: Test fix: Warn if the UAF could not be detected in kmalloc_uaf2 Alexander Potapenko 2016-02-26 13:30 ` Alexander Potapenko 2016-02-26 13:30 ` [PATCH v3 7/7] mm: kasan: Initial memory quarantine implementation Alexander Potapenko 2016-02-26 13:30 ` Alexander Potapenko 2016-02-26 14:02 ` kbuild test robot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=3d20f2bc34a72acdb407a9f8b95249ed7dd9fbe3.1456492360.git.glider@google.com \ --to=glider@google.com \ --cc=adech.fo@gmail.com \ --cc=akpm@linux-foundation.org \ --cc=cl@linux.com \ --cc=dvyukov@google.com \ --cc=iamjoonsoo.kim@lge.com \ --cc=js1304@gmail.com \ --cc=kasan-dev@googlegroups.com \ --cc=kcc@google.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=rostedt@goodmis.org \ --cc=ryabinin.a.a@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.