kunit: executor: Remove const from kunit_filter_suites() allocation type
PATCH 1/1 kunit: executor: Remove const from kunit_filter_suites() allocation type
In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)
The assigned type is "struct kunit_suite **" but the returned type will be "struct kunit_suite * const *". Since it isn't generally possible to remove the const qualifier, adjust the allocation type to match the assignment.
---
Cc: Brendan Higgins <[email protected]>
Cc: David Gow <[email protected]>
Cc: Rae Moar <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>
--- lib/kunit/executor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/kunit/executor.c +1 -1
@@ -177,7 +177,7 @@ kunit_filter_suites(const struct kunit_suite_set *suite_set,const size_t max = suite_set->end - suite_set->start; - copy =kcalloc (max,sizeof (*filtered.start),GFP_KERNEL ); + copy =kcalloc (max,sizeof (*copy),GFP_KERNEL );if (!copy) {/* won't be able to run anything, return an empty set */ return filtered; }
Signature · 1 line
2.34.1
Quoted 11 lines · Kees Cook
In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)
The assigned type is "struct
kunit_suite**" but the returned type will be "structkunit_suite* const *". Since it isn't generally possible to remove the const qualifier, adjust the allocation type to match the assignment.
Quoted 8 lines
Signed-off-by Kees Cook <[email protected]>---
Cc: Brendan Higgins <[email protected]>
Cc: David Gow <[email protected]>
Cc: Rae Moar <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>
---
Nice catch!
Cheers,
-- David
Quoted 19 lines
lib/kunit/executor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/kunit/executor.c +1
-2@@ -177,7 +177,7 @@ kunit_filter_suites(const struct kunit_suite_set *suite_set,const size_t max = suite_set->end - suite_set->start; - copy =kcalloc (max,sizeof (*filtered.start),GFP_KERNEL ); + copy =kcalloc (max,sizeof (*copy),GFP_KERNEL );if (!copy) {/* won't be able to run anything, return an empty set */ return filtered; } --2.34.1