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 09/11] kasan: fix memory corruption in kasan_bitops_tags test Date: Tue, 5 Jan 2021 19:27:53 +0100 [thread overview] Message-ID: <0c51a7266ea851797dc9816405fc40d860a48db1.1609871239.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1609871239.git.andreyknvl@google.com> Since the hardware tag-based KASAN mode might not have a redzone that comes after an allocated object (when kasan.mode=prod is enabled), the kasan_bitops_tags() test ends up corrupting the next object in memory. Change the test so it always accesses the redzone that lies within the allocated object's boundaries. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> Link: https://linux-review.googlesource.com/id/I67f51d1ee48f0a8d0fe2658c2a39e4879fe0832a --- lib/test_kasan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index b67da7f6e17f..3ea52da52714 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -771,17 +771,17 @@ static void kasan_bitops_tags(struct kunit *test) /* This test is specifically crafted for the tag-based mode. */ if (IS_ENABLED(CONFIG_KASAN_GENERIC)) { - kunit_info(test, "skipping, CONFIG_KASAN_SW_TAGS required"); + kunit_info(test, "skipping, CONFIG_KASAN_SW/HW_TAGS required"); return; } - /* Allocation size will be rounded to up granule size, which is 16. */ - bits = kzalloc(sizeof(*bits), GFP_KERNEL); + /* kmalloc-64 cache will be used and the last 16 bytes will be the redzone. */ + bits = kzalloc(48, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, bits); - /* Do the accesses past the 16 allocated bytes. */ - kasan_bitops_modify(test, BITS_PER_LONG, &bits[1]); - kasan_bitops_test_and_modify(test, BITS_PER_LONG + BITS_PER_BYTE, &bits[1]); + /* Do the accesses past the 48 allocated bytes, but within the redone. */ + kasan_bitops_modify(test, BITS_PER_LONG, (void *)bits + 48); + kasan_bitops_test_and_modify(test, BITS_PER_LONG + BITS_PER_BYTE, (void *)bits + 48); kfree(bits); } -- 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 09/11] kasan: fix memory corruption in kasan_bitops_tags test Date: Tue, 5 Jan 2021 19:27:53 +0100 [thread overview] Message-ID: <0c51a7266ea851797dc9816405fc40d860a48db1.1609871239.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1609871239.git.andreyknvl@google.com> Since the hardware tag-based KASAN mode might not have a redzone that comes after an allocated object (when kasan.mode=prod is enabled), the kasan_bitops_tags() test ends up corrupting the next object in memory. Change the test so it always accesses the redzone that lies within the allocated object's boundaries. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> Link: https://linux-review.googlesource.com/id/I67f51d1ee48f0a8d0fe2658c2a39e4879fe0832a --- lib/test_kasan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index b67da7f6e17f..3ea52da52714 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -771,17 +771,17 @@ static void kasan_bitops_tags(struct kunit *test) /* This test is specifically crafted for the tag-based mode. */ if (IS_ENABLED(CONFIG_KASAN_GENERIC)) { - kunit_info(test, "skipping, CONFIG_KASAN_SW_TAGS required"); + kunit_info(test, "skipping, CONFIG_KASAN_SW/HW_TAGS required"); return; } - /* Allocation size will be rounded to up granule size, which is 16. */ - bits = kzalloc(sizeof(*bits), GFP_KERNEL); + /* kmalloc-64 cache will be used and the last 16 bytes will be the redzone. */ + bits = kzalloc(48, GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, bits); - /* Do the accesses past the 16 allocated bytes. */ - kasan_bitops_modify(test, BITS_PER_LONG, &bits[1]); - kasan_bitops_test_and_modify(test, BITS_PER_LONG + BITS_PER_BYTE, &bits[1]); + /* Do the accesses past the 48 allocated bytes, but within the redone. */ + kasan_bitops_modify(test, BITS_PER_LONG, (void *)bits + 48); + kasan_bitops_test_and_modify(test, BITS_PER_LONG + BITS_PER_BYTE, (void *)bits + 48); kfree(bits); } -- 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 ` Andrey Konovalov [this message] 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-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 ` [PATCH 11/11] kasan: add proper page allocator tests Andrey Konovalov 2021-01-05 18:27 ` 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=0c51a7266ea851797dc9816405fc40d860a48db1.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.