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:
@@ -557,7 +557,7 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,
|
||||
int ret;
|
||||
struct drm_syncobj *syncobj;
|
||||
|
||||
syncobj = kzalloc(sizeof(struct drm_syncobj), GFP_KERNEL);
|
||||
syncobj = kzalloc_obj(struct drm_syncobj, GFP_KERNEL);
|
||||
if (!syncobj)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -1062,7 +1062,7 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs,
|
||||
goto err_free_points;
|
||||
}
|
||||
|
||||
entries = kcalloc(count, sizeof(*entries), GFP_KERNEL);
|
||||
entries = kzalloc_objs(*entries, count, GFP_KERNEL);
|
||||
if (!entries) {
|
||||
timeout = -ENOMEM;
|
||||
goto err_free_points;
|
||||
@@ -1279,7 +1279,7 @@ static int drm_syncobj_array_find(struct drm_file *file_private,
|
||||
goto err_free_handles;
|
||||
}
|
||||
|
||||
syncobjs = kmalloc_array(count_handles, sizeof(*syncobjs), GFP_KERNEL);
|
||||
syncobjs = kmalloc_objs(*syncobjs, count_handles, GFP_KERNEL);
|
||||
if (syncobjs == NULL) {
|
||||
ret = -ENOMEM;
|
||||
goto err_free_handles;
|
||||
@@ -1485,7 +1485,7 @@ drm_syncobj_eventfd_ioctl(struct drm_device *dev, void *data,
|
||||
goto err_fdget;
|
||||
}
|
||||
|
||||
entry = kzalloc(sizeof(*entry), GFP_KERNEL);
|
||||
entry = kzalloc_obj(*entry, GFP_KERNEL);
|
||||
if (!entry) {
|
||||
ret = -ENOMEM;
|
||||
goto err_kzalloc;
|
||||
|
||||
Reference in New Issue
Block a user