mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -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:
@@ -138,8 +138,9 @@ int __init ima_init_crypto(void)
|
||||
if (ima_hash_algo_idx < 0)
|
||||
ima_hash_algo_idx = NR_BANKS(ima_tpm_chip) + ima_extra_slots++;
|
||||
|
||||
ima_algo_array = kcalloc(NR_BANKS(ima_tpm_chip) + ima_extra_slots,
|
||||
sizeof(*ima_algo_array), GFP_KERNEL);
|
||||
ima_algo_array = kzalloc_objs(*ima_algo_array,
|
||||
NR_BANKS(ima_tpm_chip) + ima_extra_slots,
|
||||
GFP_KERNEL);
|
||||
if (!ima_algo_array) {
|
||||
rc = -ENOMEM;
|
||||
goto out;
|
||||
|
||||
Reference in New Issue
Block a user