mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 06:44:00 -04:00
treewide: Replace kmalloc with kmalloc_obj for non-scalar types
This is the result of running the Coccinelle script from scripts/coccinelle/api/kmalloc_objs.cocci. The script is designed to avoid scalar types (which need careful case-by-case checking), and instead replace kmalloc-family calls that allocate struct or union object instances: Single allocations: kmalloc(sizeof(TYPE), ...) are replaced with: kmalloc_obj(TYPE, ...) Array allocations: kmalloc_array(COUNT, sizeof(TYPE), ...) are replaced with: kmalloc_objs(TYPE, COUNT, ...) Flex array allocations: kmalloc(struct_size(PTR, FAM, COUNT), ...) are replaced with: kmalloc_flex(*PTR, FAM, COUNT, ...) (where TYPE may also be *VAR) The resulting allocations no longer return "void *", instead returning "TYPE *". Signed-off-by: Kees Cook <kees@kernel.org>
This commit is contained in:
@@ -168,7 +168,7 @@ static bool __report_matches(const struct expect_report *r)
|
||||
if (!report_available())
|
||||
return false;
|
||||
|
||||
expect = kmalloc(sizeof(observed.lines), GFP_KERNEL);
|
||||
expect = kmalloc_obj(observed.lines, GFP_KERNEL);
|
||||
if (WARN_ON(!expect))
|
||||
return false;
|
||||
|
||||
@@ -1538,7 +1538,7 @@ static int test_init(struct kunit *test)
|
||||
if (WARN_ON(!nthreads))
|
||||
goto err;
|
||||
|
||||
threads = kcalloc(nthreads + 1, sizeof(struct task_struct *), GFP_KERNEL);
|
||||
threads = kzalloc_objs(struct task_struct *, nthreads + 1, GFP_KERNEL);
|
||||
if (WARN_ON(!threads))
|
||||
goto err;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user