mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 03:23:53 -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:
@@ -132,16 +132,17 @@ drm_atomic_state_init(struct drm_device *dev, struct drm_atomic_state *state)
|
||||
*/
|
||||
state->allow_modeset = true;
|
||||
|
||||
state->crtcs = kcalloc(dev->mode_config.num_crtc,
|
||||
sizeof(*state->crtcs), GFP_KERNEL);
|
||||
state->crtcs = kzalloc_objs(*state->crtcs, dev->mode_config.num_crtc,
|
||||
GFP_KERNEL);
|
||||
if (!state->crtcs)
|
||||
goto fail;
|
||||
state->planes = kcalloc(dev->mode_config.num_total_plane,
|
||||
sizeof(*state->planes), GFP_KERNEL);
|
||||
state->planes = kzalloc_objs(*state->planes,
|
||||
dev->mode_config.num_total_plane,
|
||||
GFP_KERNEL);
|
||||
if (!state->planes)
|
||||
goto fail;
|
||||
state->colorops = kcalloc(dev->mode_config.num_colorop,
|
||||
sizeof(*state->colorops), GFP_KERNEL);
|
||||
state->colorops = kzalloc_objs(*state->colorops,
|
||||
dev->mode_config.num_colorop, GFP_KERNEL);
|
||||
if (!state->colorops)
|
||||
goto fail;
|
||||
|
||||
@@ -176,7 +177,7 @@ drm_atomic_state_alloc(struct drm_device *dev)
|
||||
if (!config->funcs->atomic_state_alloc) {
|
||||
struct drm_atomic_state *state;
|
||||
|
||||
state = kzalloc(sizeof(*state), GFP_KERNEL);
|
||||
state = kzalloc_obj(*state, GFP_KERNEL);
|
||||
if (!state)
|
||||
return NULL;
|
||||
if (drm_atomic_state_init(dev, state) < 0) {
|
||||
|
||||
Reference in New Issue
Block a user