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 v4 10/15] kasan: fix memory corruption in kasan_bitops_tags test Date: Fri, 15 Jan 2021 18:52:47 +0100 [thread overview] Message-ID: <7d452ce4ae35bb1988d2c9244dfea56cf2cc9315.1610733117.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1610733117.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. Link: https://linux-review.googlesource.com/id/I67f51d1ee48f0a8d0fe2658c2a39e4879fe0832a 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index 0cda4a1ff394..a06e7946f581 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -749,13 +749,13 @@ static void kasan_bitops_tags(struct kunit *test) /* This test is specifically crafted for tag-based modes. */ KASAN_TEST_NEEDS_CONFIG_OFF(test, CONFIG_KASAN_GENERIC); - /* 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.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 v4 10/15] kasan: fix memory corruption in kasan_bitops_tags test Date: Fri, 15 Jan 2021 18:52:47 +0100 [thread overview] Message-ID: <7d452ce4ae35bb1988d2c9244dfea56cf2cc9315.1610733117.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1610733117.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. Link: https://linux-review.googlesource.com/id/I67f51d1ee48f0a8d0fe2658c2a39e4879fe0832a 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index 0cda4a1ff394..a06e7946f581 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -749,13 +749,13 @@ static void kasan_bitops_tags(struct kunit *test) /* This test is specifically crafted for tag-based modes. */ KASAN_TEST_NEEDS_CONFIG_OFF(test, CONFIG_KASAN_GENERIC); - /* 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.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-15 17:54 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-15 17:52 [PATCH v4 00/15] kasan: HW_TAGS tests support and fixes Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 01/15] kasan: prefix global functions with kasan_ Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 02/15] kasan: clarify HW_TAGS impact on TBI Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 03/15] kasan: clean up comments in tests Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 04/15] kasan: add macros to simplify checking test constraints Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 05/15] kasan: add match-all tag tests Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 06/15] kasan, arm64: allow using KUnit tests with HW_TAGS mode Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 07/15] kasan: rename CONFIG_TEST_KASAN_MODULE Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 08/15] kasan: add compiler barriers to KUNIT_EXPECT_KASAN_FAIL Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 09/15] kasan: adapt kmalloc_uaf2 test to HW_TAGS mode Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov [this message] 2021-01-15 17:52 ` [PATCH v4 10/15] kasan: fix memory corruption in kasan_bitops_tags test Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 11/15] kasan: move _RET_IP_ to inline wrappers Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 12/15] kasan: fix bug detection via ksize for HW_TAGS mode Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 13/15] kasan: add proper page allocator tests Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 14/15] kasan: add a test for kmem_cache_alloc/free_bulk Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` [PATCH v4 15/15] kasan: don't run tests when KASAN is not enabled Andrey Konovalov 2021-01-15 17:52 ` Andrey Konovalov 2021-01-15 17:52 ` 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=7d452ce4ae35bb1988d2c9244dfea56cf2cc9315.1610733117.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.