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:
@@ -981,10 +981,9 @@ int vmw_mksstat_add_ioctl(struct drm_device *dev, void *data,
|
||||
BUG_ON(dev_priv->mksstat_user_pages[slot]);
|
||||
|
||||
/* Allocate statically-sized temp arrays for pages -- too big to keep in frame */
|
||||
pages_stat = (struct page **)kmalloc_array(
|
||||
ARRAY_SIZE(pdesc->statPPNs) +
|
||||
ARRAY_SIZE(pdesc->infoPPNs) +
|
||||
ARRAY_SIZE(pdesc->strsPPNs), sizeof(*pages_stat), GFP_KERNEL);
|
||||
pages_stat = (struct page **) kmalloc_objs(*pages_stat,
|
||||
ARRAY_SIZE(pdesc->statPPNs) + ARRAY_SIZE(pdesc->infoPPNs) + ARRAY_SIZE(pdesc->strsPPNs),
|
||||
GFP_KERNEL);
|
||||
|
||||
if (!pages_stat)
|
||||
goto err_nomem;
|
||||
|
||||
Reference in New Issue
Block a user