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:
@@ -3798,14 +3798,13 @@ static int __net_init unix_net_init(struct net *net)
|
||||
goto err_sysctl;
|
||||
#endif
|
||||
|
||||
net->unx.table.locks = kvmalloc_array(UNIX_HASH_SIZE,
|
||||
sizeof(spinlock_t), GFP_KERNEL);
|
||||
net->unx.table.locks = kvmalloc_objs(spinlock_t, UNIX_HASH_SIZE,
|
||||
GFP_KERNEL);
|
||||
if (!net->unx.table.locks)
|
||||
goto err_proc;
|
||||
|
||||
net->unx.table.buckets = kvmalloc_array(UNIX_HASH_SIZE,
|
||||
sizeof(struct hlist_head),
|
||||
GFP_KERNEL);
|
||||
net->unx.table.buckets = kvmalloc_objs(struct hlist_head,
|
||||
UNIX_HASH_SIZE, GFP_KERNEL);
|
||||
if (!net->unx.table.buckets)
|
||||
goto free_locks;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user