mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-03-22 07:27:12 +08: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:
@@ -95,7 +95,7 @@ static struct landlock_details *get_current_details(void)
|
||||
* caller.
|
||||
*/
|
||||
details =
|
||||
kzalloc(struct_size(details, exe_path, path_size), GFP_KERNEL);
|
||||
kzalloc_flex(*details, exe_path, path_size, GFP_KERNEL);
|
||||
if (!details)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ landlock_create_object(const struct landlock_object_underops *const underops,
|
||||
|
||||
if (WARN_ON_ONCE(!underops || !underobj))
|
||||
return ERR_PTR(-ENOENT);
|
||||
new_object = kzalloc(sizeof(*new_object), GFP_KERNEL_ACCOUNT);
|
||||
new_object = kzalloc_obj(*new_object, GFP_KERNEL_ACCOUNT);
|
||||
if (!new_object)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
refcount_set(&new_object->usage, 1);
|
||||
|
||||
@@ -33,8 +33,8 @@ static struct landlock_ruleset *create_ruleset(const u32 num_layers)
|
||||
struct landlock_ruleset *new_ruleset;
|
||||
|
||||
new_ruleset =
|
||||
kzalloc(struct_size(new_ruleset, access_masks, num_layers),
|
||||
GFP_KERNEL_ACCOUNT);
|
||||
kzalloc_flex(*new_ruleset, access_masks, num_layers,
|
||||
GFP_KERNEL_ACCOUNT);
|
||||
if (!new_ruleset)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
refcount_set(&new_ruleset->usage, 1);
|
||||
@@ -123,8 +123,8 @@ create_rule(const struct landlock_id id,
|
||||
} else {
|
||||
new_num_layers = num_layers;
|
||||
}
|
||||
new_rule = kzalloc(struct_size(new_rule, layers, new_num_layers),
|
||||
GFP_KERNEL_ACCOUNT);
|
||||
new_rule = kzalloc_flex(*new_rule, layers, new_num_layers,
|
||||
GFP_KERNEL_ACCOUNT);
|
||||
if (!new_rule)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
RB_CLEAR_NODE(&new_rule->node);
|
||||
@@ -559,8 +559,8 @@ landlock_merge_ruleset(struct landlock_ruleset *const parent,
|
||||
if (IS_ERR(new_dom))
|
||||
return new_dom;
|
||||
|
||||
new_dom->hierarchy =
|
||||
kzalloc(sizeof(*new_dom->hierarchy), GFP_KERNEL_ACCOUNT);
|
||||
new_dom->hierarchy = kzalloc_obj(*new_dom->hierarchy,
|
||||
GFP_KERNEL_ACCOUNT);
|
||||
if (!new_dom->hierarchy)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
|
||||
@@ -237,7 +237,7 @@ static int tsync_works_grow_by(struct tsync_works *s, size_t n, gfp_t flags)
|
||||
s->works = works;
|
||||
|
||||
for (i = s->capacity; i < new_capacity; i++) {
|
||||
work = kzalloc(sizeof(*work), flags);
|
||||
work = kzalloc_obj(*work, flags);
|
||||
if (!work) {
|
||||
/*
|
||||
* Leave the object in a consistent state,
|
||||
|
||||
Reference in New Issue
Block a user