kunit/overflow: Fix UB in overflow_allocation_test
PATCH 1/1 kunit/overflow: Fix UB in overflow_allocation_test
The 'device_name' array doesn't exist out of the 'overflow_allocation_test' function scope. However, it is being used as a driver name when calling 'kunit_driver_create' from 'kunit_device_register'. It produces the kernel panic with KASAN enabled.
Since this variable is used in one place only, remove it and pass the device name into kunit_device_register directly as an ascii string.
--- lib/overflow_kunit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
lib/overflow_kunit.c +1 -2
@@ -668,7 +668,6 @@ DEFINE_TEST_ALLOC(devm_kzalloc, devm_kfree, 1, 1, 0);static void overflow_allocation_test (struct kunit *test) { -const char device_name[] ="overflow-test" ;struct device *dev;int count =0 ;
@@ -678,7 +677,7 @@ static void overflow_allocation_test(struct kunit *test) }while (0 )/* Create dummy device for devm_kmalloc()-family tests. */ - dev =kunit_device_register (test, device_name); + dev =kunit_device_register (test,"overflow-test" );KUNIT_ASSERT_FALSE_MSG (test,IS_ERR (dev),"Cannot register test device\n" );
Signature · 1 line
2.34.1
Quoted 37 lines · On Thu, 15 Aug 2024 01:04:31 +0100 Ivan Orlov <[email protected]> wrote:
The '
device_name' array doesn't exist out of the 'overflow_allocation_test' function scope. However, it is being used as a driver name when calling 'kunit_driver_create' from 'kunit_device_register'. It produces the kernel panic with KASAN enabled.Since this variable is used in one place only, remove it and pass the device name into
kunit_device_registerdirectly as an ascii string.Signed-off-by Ivan Orlov <[email protected]>--- lib/overflow_kunit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)lib/overflow_kunit.c +1
-2@@ -668,7 +668,6 @@ DEFINE_TEST_ALLOC(devm_kzalloc, devm_kfree, 1, 1, 0);static void overflow_allocation_test (struct kunit *test) { -const char device_name[] ="overflow-test" ;struct device *dev;int count =0 ;@@ -678,7 +677,7 @@ static void overflow_allocation_test(struct kunit *test) }while (0 )/* Create dummy device for devm_kmalloc()-family tests. */ - dev =kunit_device_register (test, device_name); + dev =kunit_device_register (test,"overflow-test" );KUNIT_ASSERT_FALSE_MSG (test,IS_ERR (dev),"Cannot register test device\n" );Signature · 1 line
2.34.1
Thanks Ivan!
I can confirm that your patch fixes the KASAN hit on ppc32 when the overflow_kunit test is built as a module and modprobed later.
Regards,
Erhard
Quoted 7 lines · Ivan Orlov
The '
device_name' array doesn't exist out of the 'overflow_allocation_test' function scope. However, it is being used as a driver name when calling 'kunit_driver_create' from 'kunit_device_register'. It produces the kernel panic with KASAN enabled.
Quoted 5 lines
Since this variable is used in one place only, remove it and pass the device name into
kunit_device_registerdirectly as an ascii string.Signed-off-by Ivan Orlov <[email protected]>---
Thanks -- we've got plans to add support for non-constant strings here, but the first version had some issues, and (Kees -- correct me if I'm wrong) there doesn't seem to be any need to have this be dynamically allocated.
Cheers,
-- David
Quoted 27 lines
lib/overflow_kunit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)lib/overflow_kunit.c +1
-3@@ -668,7 +668,6 @@ DEFINE_TEST_ALLOC(devm_kzalloc, devm_kfree, 1, 1, 0);static void overflow_allocation_test (struct kunit *test) { -const char device_name[] ="overflow-test" ;struct device *dev;int count =0 ;@@ -678,7 +677,7 @@ static void overflow_allocation_test(struct kunit *test) }while (0 )/* Create dummy device for devm_kmalloc()-family tests. */ - dev =kunit_device_register (test, device_name); + dev =kunit_device_register (test,"overflow-test" );KUNIT_ASSERT_FALSE_MSG (test,IS_ERR (dev),"Cannot register test device\n" ); --2.34.1
Kees Cook
AppliedQuoted 10 lines · Ivan Orlov
The '
device_name' array doesn't exist out of the 'overflow_allocation_test' function scope. However, it is being used as a driver name when calling 'kunit_driver_create' from 'kunit_device_register'. It produces the kernel panic with KASAN enabled.Since this variable is used in one place only, remove it and pass the device name into
kunit_device_registerdirectly as an ascii string.[...]
Applied to for-linus/hardening, thanks!
[1/1] kunit/overflow: Fix UB in overflow_allocation_test
https://git.kernel.org/kees/c/92e9bac18124
Take care,
Signature · 1 line
Kees Cook
Andrew Morton
maintainerQuoted 8 lines · On Thu, 15 Aug 2024 01:04:31 +0100 Ivan Orlov <[email protected]> wrote:
The '
device_name' array doesn't exist out of the 'overflow_allocation_test' function scope. However, it is being used as a driver name when calling 'kunit_driver_create' from 'kunit_device_register'. It produces the kernel panic with KASAN enabled.Since this variable is used in one place only, remove it and pass the device name into
kunit_device_registerdirectly as an ascii string.
yes?
I'll grab it now, but perhaps Kees will handle this.
Quoted 8 lines · Andrew Morton
Quoted 6 lines · On Thu, 15 Aug 2024 01:04:31 +0100 Ivan Orlov <[email protected]> wrote:
The '
device_name' array doesn't exist out of the 'overflow_allocation_test' function scope. However, it is being used as a driver name when calling 'kunit_driver_create' from 'kunit_device_register'. It produces the kernel panic with KASAN enabled.
Quoted 8 lines
Quoted 2 lines
Since this variable is used in one place only, remove it and pass the device name into
kunit_device_registerdirectly as an ascii string.Fixes ca90800a91ba ("test_overflow: Add memory allocation overflow tests")Cc <[email protected]>yes?
Ah, yes, sorry, I should've specified the fixes tag in the patch :(
Quoted 3 lines
I'll grab it now, but perhaps Kees will handle this.
Thanks!
Signature · 2 lines
Kind regards, Ivan Orlov
Quoted 11 lines · Andrew Morton
Quoted 8 lines · On Thu, 15 Aug 2024 01:04:31 +0100 Ivan Orlov <[email protected]> wrote:
The '
device_name' array doesn't exist out of the 'overflow_allocation_test' function scope. However, it is being used as a driver name when calling 'kunit_driver_create' from 'kunit_device_register'. It produces the kernel panic with KASAN enabled.Since this variable is used in one place only, remove it and pass the device name into
kunit_device_registerdirectly as an ascii string.
Quoted 7 lines
Fixes ca90800a91ba ("test_overflow: Add memory allocation overflow tests")Cc <[email protected]>yes?
I'll grab it now, but perhaps Kees will handle this.
I already grabbed it:
https://lore.kernel.org/lkml/[email protected]/
But I'll update the tags. Thanks!
Signature · 1 line
Kees Cook
Andrew Morton
maintainerQuoted 1 line · On Thu, 15 Aug 2024 01:04:31 +0100 Ivan Orlov <[email protected]> wrote:
Subject: [PATCH] kunit/overflow: Fix UB in
overflow_allocation_test
What's "UB", btw?
Quoted 5 lines · Andrew Morton
Quoted 1 line · On Thu, 15 Aug 2024 01:04:31 +0100 Ivan Orlov <[email protected]> wrote:
Subject: [PATCH] kunit/overflow: Fix UB in
overflow_allocation_testWhat's "UB", btw?
UB in the patch title stands for "undefined behavior", since passing a pointer with such a short lifetime to kunit_device_register causes one.
I was not sure about how to call this type of issues (misallocation, probably?), so I decided to give it a generic name :)
Signature · 2 lines
Kind regards, Ivan Orlov