From: Andrey Konovalov <andreyknvl@google.com> To: Andrew Morton <akpm@linux-foundation.org>, 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: Will Deacon <will.deacon@arm.com>, Andrey Ryabinin <aryabinin@virtuozzo.com>, Peter Collingbourne <pcc@google.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 v3 09/15] kasan: adapt kmalloc_uaf2 test to HW_TAGS mode Date: Thu, 14 Jan 2021 20:36:25 +0100 [thread overview] Message-ID: <62a4d6dba701ad4747d836fb08c20fdfffc701f8.1610652890.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1610652890.git.andreyknvl@google.com> In the kmalloc_uaf2() test, the pointers to the two allocated memory blocks might happen to be the same, and the test will fail. With the software tag-based mode, the probability of the that is 1/254, so it's hard to observe the failure. For the hardware tag-based mode though, the probablity is 1/14, which is quite noticable. Allow up to 16 attempts at generating different tags for the tag-based modes. Link: https://linux-review.googlesource.com/id/Ibfa458ef2804ff465d8eb07434a300bf36388d55 Reviewed-by: Marco Elver <elver@google.com> Reviewed-by: Alexander Potapenko <glider@google.com> Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- lib/test_kasan.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index 2419e36e117b..0cda4a1ff394 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -382,7 +382,9 @@ static void kmalloc_uaf2(struct kunit *test) { char *ptr1, *ptr2; size_t size = 43; + int counter = 0; +again: ptr1 = kmalloc(size, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr1); @@ -391,6 +393,15 @@ static void kmalloc_uaf2(struct kunit *test) ptr2 = kmalloc(size, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr2); + /* + * For tag-based KASAN ptr1 and ptr2 tags might happen to be the same. + * Allow up to 16 attempts at generating different tags. + */ + if (!IS_ENABLED(CONFIG_KASAN_GENERIC) && ptr1 == ptr2 && counter++ < 16) { + kfree(ptr2); + goto again; + } + KUNIT_EXPECT_KASAN_FAIL(test, ptr1[40] = 'x'); KUNIT_EXPECT_PTR_NE(test, ptr1, ptr2); -- 2.30.0.284.gd98b1dd5eaa7-goog
WARNING: multiple messages have this Message-ID (diff)
From: Andrey Konovalov <andreyknvl@google.com> To: Andrew Morton <akpm@linux-foundation.org>, 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>, Peter Collingbourne <pcc@google.com>, Evgenii Stepanov <eugenis@google.com> Subject: [PATCH v3 09/15] kasan: adapt kmalloc_uaf2 test to HW_TAGS mode Date: Thu, 14 Jan 2021 20:36:25 +0100 [thread overview] Message-ID: <62a4d6dba701ad4747d836fb08c20fdfffc701f8.1610652890.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1610652890.git.andreyknvl@google.com> In the kmalloc_uaf2() test, the pointers to the two allocated memory blocks might happen to be the same, and the test will fail. With the software tag-based mode, the probability of the that is 1/254, so it's hard to observe the failure. For the hardware tag-based mode though, the probablity is 1/14, which is quite noticable. Allow up to 16 attempts at generating different tags for the tag-based modes. Link: https://linux-review.googlesource.com/id/Ibfa458ef2804ff465d8eb07434a300bf36388d55 Reviewed-by: Marco Elver <elver@google.com> Reviewed-by: Alexander Potapenko <glider@google.com> Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- lib/test_kasan.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index 2419e36e117b..0cda4a1ff394 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -382,7 +382,9 @@ static void kmalloc_uaf2(struct kunit *test) { char *ptr1, *ptr2; size_t size = 43; + int counter = 0; +again: ptr1 = kmalloc(size, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr1); @@ -391,6 +393,15 @@ static void kmalloc_uaf2(struct kunit *test) ptr2 = kmalloc(size, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr2); + /* + * For tag-based KASAN ptr1 and ptr2 tags might happen to be the same. + * Allow up to 16 attempts at generating different tags. + */ + if (!IS_ENABLED(CONFIG_KASAN_GENERIC) && ptr1 == ptr2 && counter++ < 16) { + kfree(ptr2); + goto again; + } + KUNIT_EXPECT_KASAN_FAIL(test, ptr1[40] = 'x'); KUNIT_EXPECT_PTR_NE(test, ptr1, ptr2); -- 2.30.0.284.gd98b1dd5eaa7-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-14 19:38 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-14 19:36 [PATCH v3 00/15] kasan: HW_TAGS tests support and fixes Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` [PATCH v3 01/15] kasan: prefix global functions with kasan_ Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` [PATCH v3 02/15] kasan: clarify HW_TAGS impact on TBI Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` [PATCH v3 03/15] kasan: clean up comments in tests Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-15 13:26 ` Alexander Potapenko 2021-01-15 13:26 ` Alexander Potapenko 2021-01-15 13:26 ` Alexander Potapenko 2021-01-14 19:36 ` [PATCH v3 04/15] kasan: add macros to simplify checking test constraints Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` [PATCH v3 05/15] kasan: add match-all tag tests Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-15 13:33 ` Alexander Potapenko 2021-01-15 13:33 ` Alexander Potapenko 2021-01-15 13:33 ` Alexander Potapenko 2021-01-14 19:36 ` [PATCH v3 06/15] kasan, arm64: allow using KUnit tests with HW_TAGS mode Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` [PATCH v3 07/15] kasan: rename CONFIG_TEST_KASAN_MODULE Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` [PATCH v3 08/15] kasan: add compiler barriers to KUNIT_EXPECT_KASAN_FAIL Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-15 14:11 ` Alexander Potapenko 2021-01-15 14:11 ` Alexander Potapenko 2021-01-15 14:11 ` Alexander Potapenko 2021-01-14 19:36 ` Andrey Konovalov [this message] 2021-01-14 19:36 ` [PATCH v3 09/15] kasan: adapt kmalloc_uaf2 test to HW_TAGS mode Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` [PATCH v3 10/15] kasan: fix memory corruption in kasan_bitops_tags test Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` [PATCH v3 11/15] kasan: move _RET_IP_ to inline wrappers Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-15 13:19 ` Marco Elver 2021-01-15 13:19 ` Marco Elver 2021-01-15 14:07 ` Alexander Potapenko 2021-01-15 14:07 ` Alexander Potapenko 2021-01-15 14:07 ` Alexander Potapenko 2021-01-14 19:36 ` [PATCH v3 12/15] kasan: fix bug detection via ksize for HW_TAGS mode Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-15 13:17 ` Marco Elver 2021-01-15 13:17 ` Marco Elver 2021-01-15 14:04 ` Alexander Potapenko 2021-01-15 14:04 ` Alexander Potapenko 2021-01-15 14:04 ` Alexander Potapenko 2021-01-14 19:36 ` [PATCH v3 13/15] kasan: add proper page allocator tests Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` [PATCH v3 14/15] kasan: add a test for kmem_cache_alloc/free_bulk Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-15 13:16 ` Marco Elver 2021-01-15 13:16 ` Marco Elver 2021-01-15 13:49 ` Alexander Potapenko 2021-01-15 13:49 ` Alexander Potapenko 2021-01-15 13:49 ` Alexander Potapenko 2021-01-15 17:24 ` Andrey Konovalov 2021-01-15 17:24 ` Andrey Konovalov 2021-01-15 17:24 ` Andrey Konovalov 2021-01-14 19:36 ` [PATCH v3 15/15] kasan: don't run tests when KASAN is not enabled Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-14 19:36 ` Andrey Konovalov 2021-01-15 13:13 ` Marco Elver 2021-01-15 13:13 ` Marco Elver 2021-01-15 13:44 ` Alexander Potapenko 2021-01-15 13:44 ` Alexander Potapenko 2021-01-15 13:44 ` Alexander Potapenko
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=62a4d6dba701ad4747d836fb08c20fdfffc701f8.1610652890.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=pcc@google.com \ --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.