Skip to contentSkip to conversation

kunit/overflow: Fix UB in overflow_allocation_test

PATCH Applied Ivan Orlov 5 participants 9 messages Aug 15, 2024 – Aug 16, 2024 Library code

lore
Share & tools
lore

Ivan Orlov

author
#0 lore raw

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
index f314a0c15a6d..2abc78367dd1 100644
@@ -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
#1 lore raw
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_register directly as an ascii string.

---
 lib/overflow_kunit.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
lib/overflow_kunit.c +1 -2
index f314a0c15a6d..2abc78367dd1 100644
@@ -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

Reviewed-by on v1 1/1
#2 lore raw
In reply to Ivan Orlov
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_register directly as an ascii string.

---

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
index f314a0c15a6d..2abc78367dd1 100644
@@ -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

Applied
#3 lore raw
In reply to Ivan Orlov
Quoted 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_register directly 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
maintainer
#4 lore raw
In reply to Ivan Orlov
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_register directly as an ascii string.

Fixes ca90800a91ba ("test_overflow: Add memory allocation overflow tests")

yes?

I'll grab it now, but perhaps Kees will handle this.

author
#5 lore raw
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_register directly as an ascii string.

Fixes ca90800a91ba ("test_overflow: Add memory allocation overflow tests")

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
#6 lore raw
In reply to Andrew Morton
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_register directly as an ascii string.

Quoted 7 lines
Fixes ca90800a91ba ("test_overflow: Add memory allocation overflow tests")

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
author
#8 lore raw
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_test

What'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