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:
@@ -723,7 +723,7 @@ static struct nsim_rq *nsim_queue_alloc(void)
|
||||
{
|
||||
struct nsim_rq *rq;
|
||||
|
||||
rq = kzalloc(sizeof(*rq), GFP_KERNEL_ACCOUNT);
|
||||
rq = kzalloc_obj(*rq, GFP_KERNEL_ACCOUNT);
|
||||
if (!rq)
|
||||
return NULL;
|
||||
|
||||
@@ -997,8 +997,7 @@ static int nsim_queue_init(struct netdevsim *ns)
|
||||
struct net_device *dev = ns->netdev;
|
||||
int i;
|
||||
|
||||
ns->rq = kcalloc(dev->num_rx_queues, sizeof(*ns->rq),
|
||||
GFP_KERNEL_ACCOUNT);
|
||||
ns->rq = kzalloc_objs(*ns->rq, dev->num_rx_queues, GFP_KERNEL_ACCOUNT);
|
||||
if (!ns->rq)
|
||||
return -ENOMEM;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user