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:
@@ -332,7 +332,7 @@ property_entries_dup(const struct property_entry *properties)
|
||||
while (properties[n].name)
|
||||
n++;
|
||||
|
||||
p = kcalloc(n + 1, sizeof(*p), GFP_KERNEL);
|
||||
p = kzalloc_objs(*p, n + 1, GFP_KERNEL);
|
||||
if (!p)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
@@ -758,7 +758,7 @@ static struct software_node *software_node_alloc(const struct property_entry *pr
|
||||
if (IS_ERR(props))
|
||||
return ERR_CAST(props);
|
||||
|
||||
node = kzalloc(sizeof(*node), GFP_KERNEL);
|
||||
node = kzalloc_obj(*node, GFP_KERNEL);
|
||||
if (!node) {
|
||||
property_entries_free(props);
|
||||
return ERR_PTR(-ENOMEM);
|
||||
@@ -805,7 +805,7 @@ swnode_register(const struct software_node *node, struct swnode *parent,
|
||||
struct swnode *swnode;
|
||||
int ret;
|
||||
|
||||
swnode = kzalloc(sizeof(*swnode), GFP_KERNEL);
|
||||
swnode = kzalloc_obj(*swnode, GFP_KERNEL);
|
||||
if (!swnode)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user