kunit: kasan_test: disable fortify string checker on kmalloc_oob_memset
Subsystems (2)
PATCH 1/1 kunit: kasan_test: disable fortify string checker on kmalloc_oob_memset
similar to commit 09c6304e38e4 ("kasan: test: fix compatibility with FORTIFY_SOURCE") the kernel is panicing in kmalloc_oob_memset_*.
This is due to the ptr not being hidden from the optimizer which would disable the runtime fortify string checker.
kernel BUG at lib/string_helpers.c:1048!
Call Trace: [<00000000272502e2>] fortify_panic+0x2a/0x30 ([<00000000272502de>] fortify_panic+0x26/0x30) [<001bffff817045c4>] kmalloc_oob_memset_2+0x22c/0x230 [kasan_test]
Hide the ptr variable from the optimizer to fix the kernel panic. Also define a size2 variable and hide that as well. This cleans up the code and follows the same convention as other tests.
--- mm/kasan/kasan_test.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
mm/kasan/kasan_test.c +16 -4
@@ -493,14 +493,17 @@ static void kmalloc_oob_memset_2(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =2 ;KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS (test); ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr); +OPTIMIZER_HIDE_VAR (ptr);OPTIMIZER_HIDE_VAR (size); -KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -1 ,0 ,2 )); +OPTIMIZER_HIDE_VAR (size2); +KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -1 ,0 , size2));kfree (ptr); }
@@ -508,14 +511,17 @@ static void kmalloc_oob_memset_4(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =4 ;KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS (test); ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr); +OPTIMIZER_HIDE_VAR (ptr);OPTIMIZER_HIDE_VAR (size); -KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -3 ,0 ,4 )); +OPTIMIZER_HIDE_VAR (size2); +KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -3 ,0 , size2));kfree (ptr); }
@@ -523,14 +529,17 @@ static void kmalloc_oob_memset_8(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =8 ;KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS (test); ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr); +OPTIMIZER_HIDE_VAR (ptr);OPTIMIZER_HIDE_VAR (size); -KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -7 ,0 ,8 )); +OPTIMIZER_HIDE_VAR (size2); +KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -7 ,0 , size2));kfree (ptr); }
@@ -538,14 +547,17 @@ static void kmalloc_oob_memset_16(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =16 ;KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS (test); ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr); +OPTIMIZER_HIDE_VAR (ptr);OPTIMIZER_HIDE_VAR (size); -KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -15 ,0 ,16 )); +OPTIMIZER_HIDE_VAR (size2); +KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -15 ,0 , size2));kfree (ptr); }
Signature · 1 line
2.43.0
Quoted 27 lines · Nico Pache
similar to commit
09c6304e38e4("kasan: test: fix compatibility withFORTIFY_SOURCE") the kernel is panicing in kmalloc_oob_memset_*.This is due to the
ptrnot being hidden from the optimizer which would disable the runtime fortify string checker.kernel BUG at
lib/string_helpers.c:1048!Call Trace: [<00000000272502e2>] fortify_panic+0x2a/0x30 ([<00000000272502de>] fortify_panic+0x26/0x30) [<001bffff817045c4>] kmalloc_oob_memset_2+0x22c/0x230 [kasan_test]Hide the
ptrvariable from the optimizer to fix the kernel panic. Also define a size2 variable and hide that as well. This cleans up the code and follows the same convention as other tests.Signed-off-by Nico Pache <[email protected]>--- mm/kasan/kasan_test.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)mm/kasan/kasan_test.c +0
-0
mm/kasan/kasan_test.c static void kmalloc_oob_memset_2(struct kunit *test) · line 496
Quoted 4 lines
mm/kasan/kasan_test.c +1
-0@@ -493,14 +493,17 @@ static void kmalloc_oob_memset_2(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =2 ;
Let's name this variable access_size or memset_size. Here and in the other changed tests.
Quoted 71 lines
mm/kasan/kasan_test.c +15
-5KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS (test); ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr); +OPTIMIZER_HIDE_VAR (ptr);OPTIMIZER_HIDE_VAR (size); -KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -1 ,0 ,2 )); +OPTIMIZER_HIDE_VAR (size2); +KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -1 ,0 , size2));kfree (ptr); }@@ -508,14 +511,17 @@ static void kmalloc_oob_memset_4(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =4 ;KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS (test); ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr); +OPTIMIZER_HIDE_VAR (ptr);OPTIMIZER_HIDE_VAR (size); -KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -3 ,0 ,4 )); +OPTIMIZER_HIDE_VAR (size2); +KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -3 ,0 , size2));kfree (ptr); }@@ -523,14 +529,17 @@ static void kmalloc_oob_memset_8(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =8 ;KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS (test); ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr); +OPTIMIZER_HIDE_VAR (ptr);OPTIMIZER_HIDE_VAR (size); -KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -7 ,0 ,8 )); +OPTIMIZER_HIDE_VAR (size2); +KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -7 ,0 , size2));kfree (ptr); }@@ -538,14 +547,17 @@ static void kmalloc_oob_memset_16(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =16 ;KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS (test); ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr); +OPTIMIZER_HIDE_VAR (ptr);OPTIMIZER_HIDE_VAR (size); -KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -15 ,0 ,16 )); +OPTIMIZER_HIDE_VAR (size2); +KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -15 ,0 , size2));kfree (ptr); } --
Quoted 2 lines
2.43.0
With the fix mentioned above addressed:
Quoted 24 lines · Andrey Konovalov
Quoted 22 lines · Nico Pache
similar to commit
09c6304e38e4("kasan: test: fix compatibility withFORTIFY_SOURCE") the kernel is panicing in kmalloc_oob_memset_*.This is due to the
ptrnot being hidden from the optimizer which would disable the runtime fortify string checker.kernel BUG at
lib/string_helpers.c:1048!Call Trace: [<00000000272502e2>] fortify_panic+0x2a/0x30 ([<00000000272502de>] fortify_panic+0x26/0x30) [<001bffff817045c4>] kmalloc_oob_memset_2+0x22c/0x230 [kasan_test]Hide the
ptrvariable from the optimizer to fix the kernel panic. Also define a size2 variable and hide that as well. This cleans up the code and follows the same convention as other tests.Signed-off-by Nico Pache <[email protected]>--- mm/kasan/kasan_test.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
Quoted 12 lines
mm/kasan/kasan_test.c static void kmalloc_oob_memset_2(struct kunit *test) · line 496
Quoted 9 lines
mm/kasan/kasan_test.c +1
-0@@ -493,14 +493,17 @@ static void kmalloc_oob_memset_2(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =2 ;Let's name this variable
access_sizeormemset_size. Here and in the other changed tests.
Hi Andrey,
I agree that is a better variable name, but I chose size2 because other kasan tests follow the same pattern.
Please let me know if you still want me to update it given that info and I'll send a V2.
Cheers,
-- Nico
Quoted 79 lines
Quoted 72 lines
mm/kasan/kasan_test.c +15
-5KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS (test); ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr); +OPTIMIZER_HIDE_VAR (ptr);OPTIMIZER_HIDE_VAR (size); -KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -1 ,0 ,2 )); +OPTIMIZER_HIDE_VAR (size2); +KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -1 ,0 , size2));kfree (ptr); }@@ -508,14 +511,17 @@ static void kmalloc_oob_memset_4(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =4 ;KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS (test); ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr); +OPTIMIZER_HIDE_VAR (ptr);OPTIMIZER_HIDE_VAR (size); -KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -3 ,0 ,4 )); +OPTIMIZER_HIDE_VAR (size2); +KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -3 ,0 , size2));kfree (ptr); }@@ -523,14 +529,17 @@ static void kmalloc_oob_memset_8(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =8 ;KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS (test); ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr); +OPTIMIZER_HIDE_VAR (ptr);OPTIMIZER_HIDE_VAR (size); -KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -7 ,0 ,8 )); +OPTIMIZER_HIDE_VAR (size2); +KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -7 ,0 , size2));kfree (ptr); }@@ -538,14 +547,17 @@ static void kmalloc_oob_memset_16(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =16 ;KASAN_TEST_NEEDS_CHECKED_MEMINTRINSICS (test); ptr =kmalloc (size,GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, ptr); +OPTIMIZER_HIDE_VAR (ptr);OPTIMIZER_HIDE_VAR (size); -KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -15 ,0 ,16 )); +OPTIMIZER_HIDE_VAR (size2); +KUNIT_EXPECT_KASAN_FAIL (test,memset (ptr + size -15 ,0 , size2));kfree (ptr); } --Quoted 2 lines
2.43.0
With the fix mentioned above addressed:
Reviewed-by Andrey Konovalov <[email protected]>
Andrey Konovalov
reviewerQuoted 14 lines · Nico Pache
Quoted 13 lines
mm/kasan/kasan_test.c static void kmalloc_oob_memset_2(struct kunit *test) · line 496
Quoted 10 lines
mm/kasan/kasan_test.c +1
-0@@ -493,14 +493,17 @@ static void kmalloc_oob_memset_2(struct kunit *test) {char *ptr;size_t size =128 -KASAN_GRANULE_SIZE ; +size_t size2 =2 ;Let's name this variable
access_sizeormemset_size. Here and in the other changed tests.
Quoted 4 lines
Hi Andrey,
I agree that is a better variable name, but I chose size2 because other kasan tests follow the same pattern.
These other tests use size1 and size2 to refer to different sizes of krealloc allocations, which seems reasonable.
Quoted 2 lines
Please let me know if you still want me to update it given that info and I'll send a V2.
Yes, please update the name.
Thank you!