Skip to contentSkip to conversation

usb: gadget: g_ffs: Adjust f_ffs[0] allocation type

PATCH New Kees Cook 1 participant 1 message Apr 26, 2025 USB

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 usb: gadget: g_ffs: Adjust f_ffs[0] allocation type

In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)

The assigned type is "struct usb_function **" but the returned type will be "struct usb_function ***". These are the same size allocation (pointer size), but different types. Adjust the allocation type to match the assignment.

---
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Wei Chen <[email protected]>
Cc: Linyu Yuan <[email protected]>
Cc: <[email protected]>

---
 drivers/usb/gadget/legacy/g_ffs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/legacy/g_ffs.c +1 -1
index a9544fea8723..578556422ea3 100644
@@ -188,7 +188,7 @@ static int __init gfs_init(void)
 	/*
 	 * Allocate in one chunk for easier maintenance
 	 */
-	f_ffs[0] = kcalloc(func_num * N_CONF, sizeof(*f_ffs), GFP_KERNEL);
+	f_ffs[0] = kcalloc(func_num * N_CONF, sizeof(*f_ffs[0]), GFP_KERNEL);
 	if (!f_ffs[0]) {
 		ret = -ENOMEM;
 		goto no_func;
Signature · 1 line
2.34.1