modules/kmod: Allocate argv with kmalloc_array()
PATCH 1/1 modules/kmod: Allocate argv with kmalloc_array()
From: Kees Cook <[email protected]>
In preparation for converting the kmalloc family of allocators to the type-aware kmalloc_obj family, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (The kmalloc family returns "void *", which can be implicitly cast to any pointer type.)
argv holds 5 pointers, but the size was taken from the array type "char *[5]", which would make the allocation type a pointer to that array rather than the "char **" being assigned. Allocate 5 entries of the target's type instead. The resulting allocation size is the same.
Build tested ARCH=x86_64 allmodconfig with GCC 16.2.0:kernel/module/kmod.o
---
Cc: Luis Chamberlain <[email protected]>
Cc: Petr Pavlu <[email protected]>
Cc: Daniel Gomez <[email protected]>
Cc: Sami Tolvanen <[email protected]>
Cc: Aaron Tomlin <[email protected]>
Cc: <[email protected]>
--- kernel/module/kmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/module/kmod.c +1 -1
@@ -81,7 +81,7 @@ static int call_modprobe(char *orig_module_name, int wait)char *module_name;int ret; -char **argv =kmalloc (sizeof (char *[5 ]),GFP_KERNEL ); +char **argv =kmalloc_array (5 ,sizeof (*argv),GFP_KERNEL );if (!argv) goto out;
Signature · 1 line
2.34.1
Petr Pavlu
maintainerQuoted 13 lines · Kees Cook
From: Kees Cook <[email protected]>
In preparation for converting the kmalloc family of allocators to the type-aware
kmalloc_objfamily, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (The kmalloc family returns "void *", which can be implicitly cast to any pointer type.)argv holds 5 pointers, but the size was taken from the array type "char *[5]", which would make the allocation type a pointer to that array rather than the "char **" being assigned. Allocate 5 entries of the target's type instead. The resulting allocation size is the same.
Quoted 5 lines
Build tested ARCH=x86_64 allmodconfig with GCC 16.2.0:
kernel/module/kmod.oAssisted-by LLM coccinelleSigned-off-by Kees Cook <[email protected]>
Looks ok to me. I've queued the patch on modules-next for 7.4-rc1.
Signature · 2 lines
Thanks, Petr