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:
@@ -118,7 +118,7 @@ static int verify_ruleset(struct setid_ruleset *pol)
|
||||
res = -EINVAL;
|
||||
|
||||
/* fix it up */
|
||||
nrule = kmalloc(sizeof(struct setid_rule), GFP_KERNEL);
|
||||
nrule = kmalloc_obj(struct setid_rule, GFP_KERNEL);
|
||||
if (!nrule)
|
||||
return -ENOMEM;
|
||||
if (pol->type == UID){
|
||||
@@ -146,7 +146,7 @@ static ssize_t handle_policy_update(struct file *file,
|
||||
if (len >= KMALLOC_MAX_SIZE)
|
||||
return -EINVAL;
|
||||
|
||||
pol = kmalloc(sizeof(struct setid_ruleset), GFP_KERNEL);
|
||||
pol = kmalloc_obj(struct setid_ruleset, GFP_KERNEL);
|
||||
if (!pol)
|
||||
return -ENOMEM;
|
||||
pol->policy_str = NULL;
|
||||
@@ -175,7 +175,7 @@ static ssize_t handle_policy_update(struct file *file,
|
||||
}
|
||||
*end = '\0';
|
||||
|
||||
rule = kmalloc(sizeof(struct setid_rule), GFP_KERNEL);
|
||||
rule = kmalloc_obj(struct setid_rule, GFP_KERNEL);
|
||||
if (!rule) {
|
||||
err = -ENOMEM;
|
||||
goto out_free_buf;
|
||||
|
||||
Reference in New Issue
Block a user