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:
@@ -101,7 +101,7 @@ int comedi_alloc_subdevices(struct comedi_device *dev, int num_subdevices)
|
||||
if (num_subdevices < 1)
|
||||
return -EINVAL;
|
||||
|
||||
s = kcalloc(num_subdevices, sizeof(*s), GFP_KERNEL);
|
||||
s = kzalloc_objs(*s, num_subdevices, GFP_KERNEL);
|
||||
if (!s)
|
||||
return -ENOMEM;
|
||||
dev->subdevices = s;
|
||||
@@ -733,7 +733,7 @@ static int __comedi_device_postconfig_async(struct comedi_device *dev,
|
||||
dev_warn(dev->class_dev,
|
||||
"async subdevices should have a cancel() function\n");
|
||||
|
||||
async = kzalloc(sizeof(*async), GFP_KERNEL);
|
||||
async = kzalloc_obj(*async, GFP_KERNEL);
|
||||
if (!async)
|
||||
return -ENOMEM;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user