Skip to contentSkip to conversation

kasan-test-avoid-gcc-warning-for-intentional-overflow.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Feb 22, 2024 Stable branch

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: kasan/test: avoid gcc warning for intentional overflow
has been removed from the -mm tree. Its filename was
kasan-test-avoid-gcc-warning-for-intentional-overflow.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Arnd Bergmann <[email protected]>
Subject: kasan/test: avoid gcc warning for intentional overflow
Date: Mon, 12 Feb 2024 12:15:52 +0100

The out-of-bounds test allocates an object that is three bytes too short in order to validate the bounds checking. Starting with gcc-14, this causes a compile-time warning as gcc has grown smart enough to understand the sizeof() logic:

mm/kasan/kasan_test.c: In function 'kmalloc_oob_16':
mm/kasan/kasan_test.c:443:14: error: allocation of insufficient size '13' for type 'struct <anonymous>' with size '16' [-Werror=alloc-size]
443 | ptr1 = kmalloc(sizeof(*ptr1) - 3, GFP_KERNEL);
| ^

Hide the actual computation behind a RELOC_HIDE() that ensures the compiler misses the intentional bug.

Fixes 3f15801cdc23 ("lib: add kasan test module")
Cc Alexander Potapenko <[email protected]>
Cc Andrey Ryabinin <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc Marco Elver <[email protected]>
Cc Vincenzo Frascino <[email protected]>

---

 mm/kasan/kasan_test.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
mm/kasan/kasan_test.c renamed from mm/kasan/kasan_test.c~kasan-test-avoid-gcc-warning-for-intentional-overflow +2 -1
@@ -440,7 +440,8 @@ static void kmalloc_oob_16(struct kunit
 	/* This test is specifically crafted for the generic mode. */
 	KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_GENERIC);
 
-	ptr1 = kmalloc(sizeof(*ptr1) - 3, GFP_KERNEL);
+	/* RELOC_HIDE to prevent gcc from warning about short alloc */
+	ptr1 = RELOC_HIDE(kmalloc(sizeof(*ptr1) - 3, GFP_KERNEL), 0);
 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr1);
 
 	ptr2 = kmalloc(sizeof(*ptr2), GFP_KERNEL);

_

Patches currently in -mm which might be from [email protected] are

mm-mmu_gather-add-tlb_remove_tlb_entries-fix.patch