From: Andrey Konovalov <andreyknvl@google.com> To: Catalin Marinas <catalin.marinas@arm.com>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Dmitry Vyukov <dvyukov@google.com>, Alexander Potapenko <glider@google.com>, Marco Elver <elver@google.com> Cc: Andrew Morton <akpm@linux-foundation.org>, Will Deacon <will.deacon@arm.com>, Andrey Ryabinin <aryabinin@virtuozzo.com>, Evgenii Stepanov <eugenis@google.com>, Branislav Rankov <Branislav.Rankov@arm.com>, Kevin Brodsky <kevin.brodsky@arm.com>, kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov <andreyknvl@google.com> Subject: [PATCH 11/11] kasan: add proper page allocator tests Date: Tue, 5 Jan 2021 19:27:55 +0100 [thread overview] Message-ID: <15ca1976b26aa9edcec4a9d0f3b73f5b6536e5d0.1609871239.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1609871239.git.andreyknvl@google.com> The currently existing page allocator tests rely on kmalloc fallback with large sizes that is only present for SLUB. Add proper tests that use alloc/free_pages(). Signed-off-by: Andrey Konovalov <andreyknvl@google.com> Link: https://linux-review.googlesource.com/id/Ia173d5a1b215fe6b2548d814ef0f4433cf983570 --- lib/test_kasan.c | 54 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index 6261521e57ad..24798c034d05 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -128,6 +128,12 @@ static void kmalloc_node_oob_right(struct kunit *test) kfree(ptr); } +/* + * These kmalloc_pagealloc_* tests try allocating a memory chunk that doesn't + * fit into a slab cache and therefore is allocated via the page allocator + * fallback. Since this kind of fallback is only implemented for SLUB, these + * tests are limited to that allocator. + */ static void kmalloc_pagealloc_oob_right(struct kunit *test) { char *ptr; @@ -138,14 +144,11 @@ static void kmalloc_pagealloc_oob_right(struct kunit *test) return; } - /* - * Allocate a chunk that does not fit into a SLUB cache to trigger - * the page allocator fallback. - */ ptr = kmalloc(size, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); KUNIT_EXPECT_KASAN_FAIL(test, ptr[size + OOB_TAG_OFF] = 0); + kfree(ptr); } @@ -161,8 +164,8 @@ static void kmalloc_pagealloc_uaf(struct kunit *test) ptr = kmalloc(size, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); - kfree(ptr); + KUNIT_EXPECT_KASAN_FAIL(test, ptr[0] = 0); } @@ -182,6 +185,45 @@ static void kmalloc_pagealloc_invalid_free(struct kunit *test) KUNIT_EXPECT_KASAN_FAIL(test, kfree(ptr + 1)); } +static void pagealloc_oob_right(struct kunit *test) +{ + char *ptr; + struct page *pages; + size_t order = 4; + size_t size = (1UL << (PAGE_SHIFT + order)); + + /* + * With generic KASAN page allocations have no redzones, thus + * out-of-bounds detection is not guaranteed. + * See https://bugzilla.kernel.org/show_bug.cgi?id=210503. + */ + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) { + kunit_info(test, "skipping, CONFIG_KASAN_GENERIC enabled"); + return; + } + + pages = alloc_pages(GFP_KERNEL, order); + ptr = page_address(pages); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); + + KUNIT_EXPECT_KASAN_FAIL(test, ptr[size] = 0); + free_pages((unsigned long)ptr, order); +} + +static void pagealloc_uaf(struct kunit *test) +{ + char *ptr; + struct page *pages; + size_t order = 4; + + pages = alloc_pages(GFP_KERNEL, order); + ptr = page_address(pages); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); + free_pages((unsigned long)ptr, order); + + KUNIT_EXPECT_KASAN_FAIL(test, ptr[0] = 0); +} + static void kmalloc_large_oob_right(struct kunit *test) { char *ptr; @@ -933,6 +975,8 @@ static struct kunit_case kasan_kunit_test_cases[] = { KUNIT_CASE(kmalloc_pagealloc_oob_right), KUNIT_CASE(kmalloc_pagealloc_uaf), KUNIT_CASE(kmalloc_pagealloc_invalid_free), + KUNIT_CASE(pagealloc_oob_right), + KUNIT_CASE(pagealloc_uaf), KUNIT_CASE(kmalloc_large_oob_right), KUNIT_CASE(kmalloc_oob_krealloc_more), KUNIT_CASE(kmalloc_oob_krealloc_less), -- 2.29.2.729.g45daf8777d-goog
WARNING: multiple messages have this Message-ID (diff)
From: Andrey Konovalov <andreyknvl@google.com> To: Catalin Marinas <catalin.marinas@arm.com>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Dmitry Vyukov <dvyukov@google.com>, Alexander Potapenko <glider@google.com>, Marco Elver <elver@google.com> Cc: Branislav Rankov <Branislav.Rankov@arm.com>, Andrey Konovalov <andreyknvl@google.com>, Kevin Brodsky <kevin.brodsky@arm.com>, Will Deacon <will.deacon@arm.com>, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, Andrey Ryabinin <aryabinin@virtuozzo.com>, Andrew Morton <akpm@linux-foundation.org>, Evgenii Stepanov <eugenis@google.com> Subject: [PATCH 11/11] kasan: add proper page allocator tests Date: Tue, 5 Jan 2021 19:27:55 +0100 [thread overview] Message-ID: <15ca1976b26aa9edcec4a9d0f3b73f5b6536e5d0.1609871239.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1609871239.git.andreyknvl@google.com> The currently existing page allocator tests rely on kmalloc fallback with large sizes that is only present for SLUB. Add proper tests that use alloc/free_pages(). Signed-off-by: Andrey Konovalov <andreyknvl@google.com> Link: https://linux-review.googlesource.com/id/Ia173d5a1b215fe6b2548d814ef0f4433cf983570 --- lib/test_kasan.c | 54 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index 6261521e57ad..24798c034d05 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -128,6 +128,12 @@ static void kmalloc_node_oob_right(struct kunit *test) kfree(ptr); } +/* + * These kmalloc_pagealloc_* tests try allocating a memory chunk that doesn't + * fit into a slab cache and therefore is allocated via the page allocator + * fallback. Since this kind of fallback is only implemented for SLUB, these + * tests are limited to that allocator. + */ static void kmalloc_pagealloc_oob_right(struct kunit *test) { char *ptr; @@ -138,14 +144,11 @@ static void kmalloc_pagealloc_oob_right(struct kunit *test) return; } - /* - * Allocate a chunk that does not fit into a SLUB cache to trigger - * the page allocator fallback. - */ ptr = kmalloc(size, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); KUNIT_EXPECT_KASAN_FAIL(test, ptr[size + OOB_TAG_OFF] = 0); + kfree(ptr); } @@ -161,8 +164,8 @@ static void kmalloc_pagealloc_uaf(struct kunit *test) ptr = kmalloc(size, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); - kfree(ptr); + KUNIT_EXPECT_KASAN_FAIL(test, ptr[0] = 0); } @@ -182,6 +185,45 @@ static void kmalloc_pagealloc_invalid_free(struct kunit *test) KUNIT_EXPECT_KASAN_FAIL(test, kfree(ptr + 1)); } +static void pagealloc_oob_right(struct kunit *test) +{ + char *ptr; + struct page *pages; + size_t order = 4; + size_t size = (1UL << (PAGE_SHIFT + order)); + + /* + * With generic KASAN page allocations have no redzones, thus + * out-of-bounds detection is not guaranteed. + * See https://bugzilla.kernel.org/show_bug.cgi?id=210503. + */ + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) { + kunit_info(test, "skipping, CONFIG_KASAN_GENERIC enabled"); + return; + } + + pages = alloc_pages(GFP_KERNEL, order); + ptr = page_address(pages); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); + + KUNIT_EXPECT_KASAN_FAIL(test, ptr[size] = 0); + free_pages((unsigned long)ptr, order); +} + +static void pagealloc_uaf(struct kunit *test) +{ + char *ptr; + struct page *pages; + size_t order = 4; + + pages = alloc_pages(GFP_KERNEL, order); + ptr = page_address(pages); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); + free_pages((unsigned long)ptr, order); + + KUNIT_EXPECT_KASAN_FAIL(test, ptr[0] = 0); +} + static void kmalloc_large_oob_right(struct kunit *test) { char *ptr; @@ -933,6 +975,8 @@ static struct kunit_case kasan_kunit_test_cases[] = { KUNIT_CASE(kmalloc_pagealloc_oob_right), KUNIT_CASE(kmalloc_pagealloc_uaf), KUNIT_CASE(kmalloc_pagealloc_invalid_free), + KUNIT_CASE(pagealloc_oob_right), + KUNIT_CASE(pagealloc_uaf), KUNIT_CASE(kmalloc_large_oob_right), KUNIT_CASE(kmalloc_oob_krealloc_more), KUNIT_CASE(kmalloc_oob_krealloc_less), -- 2.29.2.729.g45daf8777d-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-01-05 18:29 UTC|newest] Thread overview: 137+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-05 18:27 [PATCH 00/11] kasan: HW_TAGS tests support and fixes Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 18:27 ` [PATCH 01/11] kasan: prefix exported functions with kasan_ Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-12 7:38 ` Alexander Potapenko 2021-01-12 7:38 ` Alexander Potapenko 2021-01-12 7:38 ` Alexander Potapenko 2021-01-12 11:19 ` Marco Elver 2021-01-12 11:19 ` Marco Elver 2021-01-05 18:27 ` [PATCH 02/11] kasan: clarify HW_TAGS impact on TBI Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-12 7:40 ` Alexander Potapenko 2021-01-12 7:40 ` Alexander Potapenko 2021-01-12 7:40 ` Alexander Potapenko 2021-01-12 11:38 ` Marco Elver 2021-01-12 11:38 ` Marco Elver 2021-01-05 18:27 ` [PATCH 03/11] kasan: clean up comments in tests Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-12 7:53 ` Alexander Potapenko 2021-01-12 7:53 ` Alexander Potapenko 2021-01-12 7:53 ` Alexander Potapenko 2021-01-12 17:55 ` Andrey Konovalov 2021-01-12 17:55 ` Andrey Konovalov 2021-01-12 17:55 ` Andrey Konovalov 2021-01-12 13:07 ` Marco Elver 2021-01-12 13:07 ` Marco Elver 2021-01-05 18:27 ` [PATCH 04/11] kasan: add match-all tag tests Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-12 8:04 ` Alexander Potapenko 2021-01-12 8:04 ` Alexander Potapenko 2021-01-12 8:04 ` Alexander Potapenko 2021-01-12 18:10 ` Andrey Konovalov 2021-01-12 18:10 ` Andrey Konovalov 2021-01-12 18:10 ` Andrey Konovalov 2021-01-12 13:17 ` Marco Elver 2021-01-12 13:17 ` Marco Elver 2021-01-12 18:11 ` Andrey Konovalov 2021-01-12 18:11 ` Andrey Konovalov 2021-01-12 18:11 ` Andrey Konovalov 2021-01-05 18:27 ` [PATCH 05/11] kasan, arm64: allow using KUnit tests with HW_TAGS mode Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-12 19:01 ` Catalin Marinas 2021-01-12 19:01 ` Catalin Marinas 2021-01-15 13:11 ` Andrey Konovalov 2021-01-15 13:11 ` Andrey Konovalov 2021-01-15 13:11 ` Andrey Konovalov 2021-01-15 15:04 ` Vincenzo Frascino 2021-01-15 15:04 ` Vincenzo Frascino 2021-01-05 18:27 ` [PATCH 06/11] kasan: rename CONFIG_TEST_KASAN_MODULE Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-12 8:09 ` Alexander Potapenko 2021-01-12 8:09 ` Alexander Potapenko 2021-01-12 8:09 ` Alexander Potapenko 2021-01-12 18:26 ` Andrey Konovalov 2021-01-12 18:26 ` Andrey Konovalov 2021-01-12 18:26 ` Andrey Konovalov 2021-01-12 13:33 ` Marco Elver 2021-01-12 13:33 ` Marco Elver 2021-01-12 18:28 ` Andrey Konovalov 2021-01-12 18:28 ` Andrey Konovalov 2021-01-12 18:28 ` Andrey Konovalov 2021-01-05 18:27 ` [PATCH 07/11] kasan: add compiler barriers to KUNIT_EXPECT_KASAN_FAIL Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-12 8:18 ` Alexander Potapenko 2021-01-12 8:18 ` Alexander Potapenko 2021-01-12 8:18 ` Alexander Potapenko 2021-01-12 19:50 ` Andrey Konovalov 2021-01-12 19:50 ` Andrey Konovalov 2021-01-12 19:50 ` Andrey Konovalov 2021-01-12 19:57 ` Andrey Konovalov 2021-01-12 19:57 ` Andrey Konovalov 2021-01-12 19:57 ` Andrey Konovalov 2021-01-12 13:34 ` Marco Elver 2021-01-12 13:34 ` Marco Elver 2021-01-05 18:27 ` [PATCH 08/11] kasan: adopt kmalloc_uaf2 test to HW_TAGS mode Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-12 8:25 ` Alexander Potapenko 2021-01-12 8:25 ` Alexander Potapenko 2021-01-12 8:25 ` Alexander Potapenko 2021-01-12 20:04 ` Andrey Konovalov 2021-01-12 20:04 ` Andrey Konovalov 2021-01-12 20:04 ` Andrey Konovalov 2021-01-12 13:39 ` Marco Elver 2021-01-12 13:39 ` Marco Elver 2021-01-12 20:05 ` Andrey Konovalov 2021-01-12 20:05 ` Andrey Konovalov 2021-01-12 20:05 ` Andrey Konovalov 2021-01-05 18:27 ` [PATCH 09/11] kasan: fix memory corruption in kasan_bitops_tags test Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-12 8:30 ` Alexander Potapenko 2021-01-12 8:30 ` Alexander Potapenko 2021-01-12 8:30 ` Alexander Potapenko 2021-01-12 20:06 ` Andrey Konovalov 2021-01-12 20:06 ` Andrey Konovalov 2021-01-12 20:06 ` Andrey Konovalov 2021-01-13 12:30 ` Alexander Potapenko 2021-01-13 12:30 ` Alexander Potapenko 2021-01-13 12:30 ` Alexander Potapenko 2021-01-12 13:55 ` Marco Elver 2021-01-12 13:55 ` Marco Elver 2021-01-05 18:27 ` [PATCH 10/11] kasan: fix bug detection via ksize for HW_TAGS mode Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-05 21:04 ` kernel test robot 2021-01-05 21:04 ` kernel test robot 2021-01-06 0:09 ` kernel test robot 2021-01-06 0:09 ` kernel test robot 2021-01-07 0:02 ` Andrew Morton 2021-01-07 0:02 ` Andrew Morton 2021-01-07 1:59 ` Andrey Konovalov 2021-01-07 1:59 ` Andrey Konovalov 2021-01-12 14:32 ` Marco Elver 2021-01-12 14:32 ` Marco Elver 2021-01-12 21:16 ` Andrey Konovalov 2021-01-12 21:16 ` Andrey Konovalov 2021-01-12 21:16 ` Andrey Konovalov 2021-01-12 22:54 ` Marco Elver 2021-01-12 22:54 ` Marco Elver 2021-01-12 22:54 ` Marco Elver 2021-01-05 18:27 ` Andrey Konovalov [this message] 2021-01-05 18:27 ` [PATCH 11/11] kasan: add proper page allocator tests Andrey Konovalov 2021-01-05 18:27 ` Andrey Konovalov 2021-01-12 8:57 ` Alexander Potapenko 2021-01-12 8:57 ` Alexander Potapenko 2021-01-12 8:57 ` Alexander Potapenko 2021-01-12 14:34 ` Marco Elver 2021-01-12 14:34 ` Marco Elver
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=15ca1976b26aa9edcec4a9d0f3b73f5b6536e5d0.1609871239.git.andreyknvl@google.com \ --to=andreyknvl@google.com \ --cc=Branislav.Rankov@arm.com \ --cc=akpm@linux-foundation.org \ --cc=aryabinin@virtuozzo.com \ --cc=catalin.marinas@arm.com \ --cc=dvyukov@google.com \ --cc=elver@google.com \ --cc=eugenis@google.com \ --cc=glider@google.com \ --cc=kasan-dev@googlegroups.com \ --cc=kevin.brodsky@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=vincenzo.frascino@arm.com \ --cc=will.deacon@arm.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.