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:
@@ -73,7 +73,7 @@ static struct rs_codec *codec_init(int symsize, int gfpoly, int (*gffunc)(int),
|
||||
int i, j, sr, root, iprim;
|
||||
struct rs_codec *rs;
|
||||
|
||||
rs = kzalloc(sizeof(*rs), gfp);
|
||||
rs = kzalloc_obj(*rs, gfp);
|
||||
if (!rs)
|
||||
return NULL;
|
||||
|
||||
|
||||
@@ -111,7 +111,7 @@ static struct wspace *alloc_ws(struct rs_codec *rs)
|
||||
struct wspace *ws;
|
||||
int nn = rs->nn;
|
||||
|
||||
ws = kzalloc(sizeof(*ws), GFP_KERNEL);
|
||||
ws = kzalloc_obj(*ws, GFP_KERNEL);
|
||||
if (!ws)
|
||||
return NULL;
|
||||
|
||||
@@ -124,7 +124,7 @@ static struct wspace *alloc_ws(struct rs_codec *rs)
|
||||
ws->s = ws->r + nn;
|
||||
ws->corr = ws->s + nroots;
|
||||
|
||||
ws->errlocs = kmalloc_array(nn + nroots, sizeof(int), GFP_KERNEL);
|
||||
ws->errlocs = kmalloc_objs(int, nn + nroots, GFP_KERNEL);
|
||||
if (!ws->errlocs)
|
||||
goto err;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user