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:
@@ -633,13 +633,13 @@ static __init_or_module int add_sysfs_param(struct module_kobject *mk,
|
||||
|
||||
if (!mk->mp) {
|
||||
/* First allocation. */
|
||||
mk->mp = kzalloc(sizeof(*mk->mp), GFP_KERNEL);
|
||||
mk->mp = kzalloc_obj(*mk->mp, GFP_KERNEL);
|
||||
if (!mk->mp)
|
||||
return -ENOMEM;
|
||||
mk->mp->grp.name = "parameters";
|
||||
/* NULL-terminated attribute array. */
|
||||
mk->mp->grp.attrs = kzalloc(sizeof(mk->mp->grp.attrs[0]),
|
||||
GFP_KERNEL);
|
||||
mk->mp->grp.attrs = kzalloc_obj(mk->mp->grp.attrs[0],
|
||||
GFP_KERNEL);
|
||||
/* Caller will cleanup via free_module_param_attrs */
|
||||
if (!mk->mp->grp.attrs)
|
||||
return -ENOMEM;
|
||||
@@ -766,7 +766,7 @@ lookup_or_create_module_kobject(const char *name)
|
||||
if (kobj)
|
||||
return to_module_kobject(kobj);
|
||||
|
||||
mk = kzalloc(sizeof(struct module_kobject), GFP_KERNEL);
|
||||
mk = kzalloc_obj(struct module_kobject, GFP_KERNEL);
|
||||
if (!mk)
|
||||
return NULL;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user