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>,
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 v2 09/14] kasan: adapt kmalloc_uaf2 test to HW_TAGS mode
Date: Wed, 13 Jan 2021 17:21:36 +0100 [thread overview]
Message-ID: <1b884616c85091d6d173f7c1a8647d25424f1e7e.1610554432.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1610554432.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
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 283feda9882a..a1a35d75ee1e 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
next prev parent reply other threads:[~2021-01-13 16:22 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-13 16:21 [PATCH v2 00/14] kasan: HW_TAGS tests support and fixes Andrey Konovalov
2021-01-13 16:21 ` [PATCH v2 01/14] kasan: prefix global functions with kasan_ Andrey Konovalov
2021-01-13 16:21 ` [PATCH v2 02/14] kasan: clarify HW_TAGS impact on TBI Andrey Konovalov
2021-01-13 16:21 ` [PATCH v2 03/14] kasan: clean up comments in tests Andrey Konovalov
2021-01-13 16:24 ` Marco Elver
2021-01-13 16:21 ` [PATCH v2 04/14] kasan: add macros to simplify checking test constraints Andrey Konovalov
2021-01-13 16:25 ` Marco Elver
2021-01-13 16:45 ` Alexander Potapenko
2021-01-13 16:21 ` [PATCH v2 05/14] kasan: add match-all tag tests Andrey Konovalov
2021-01-13 16:26 ` Marco Elver
2021-01-13 16:21 ` [PATCH v2 06/14] kasan, arm64: allow using KUnit tests with HW_TAGS mode Andrey Konovalov
2021-01-13 16:21 ` [PATCH v2 07/14] kasan: rename CONFIG_TEST_KASAN_MODULE Andrey Konovalov
2021-01-13 16:21 ` [PATCH v2 08/14] kasan: add compiler barriers to KUNIT_EXPECT_KASAN_FAIL Andrey Konovalov
2021-01-13 16:28 ` Marco Elver
2021-01-13 16:21 ` Andrey Konovalov [this message]
2021-01-13 16:31 ` [PATCH v2 09/14] kasan: adapt kmalloc_uaf2 test to HW_TAGS mode Marco Elver
2021-01-13 16:32 ` Alexander Potapenko
2021-01-13 16:21 ` [PATCH v2 10/14] kasan: fix memory corruption in kasan_bitops_tags test Andrey Konovalov
2021-01-13 16:21 ` [PATCH v2 11/14] kasan: fix bug detection via ksize for HW_TAGS mode Andrey Konovalov
2021-01-13 16:54 ` Marco Elver
2021-01-14 17:58 ` Andrey Konovalov
2021-01-14 18:01 ` Andrey Konovalov
2021-01-14 19:56 ` Marco Elver
2021-01-13 16:21 ` [PATCH v2 12/14] kasan: add proper page allocator tests Andrey Konovalov
2021-01-13 16:21 ` [PATCH v2 13/14] kasan: add a test for kmem_cache_alloc/free_bulk Andrey Konovalov
2021-01-13 16:37 ` Marco Elver
2021-01-14 15:32 ` Andrey Konovalov
2021-01-13 16:21 ` [PATCH v2 14/14] kasan: don't run tests when KASAN is not enabled Andrey Konovalov
2021-01-13 16:39 ` Marco Elver
2021-01-14 15:32 ` Andrey Konovalov
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=1b884616c85091d6d173f7c1a8647d25424f1e7e.1610554432.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox