Skip to contentSkip to conversation

usb: gadget: storage: Use kcalloc instead of kzalloc to allocate array

PATCH Applied Thomas Meyer 2 participants 2 messages Dec 5, 2011 – Dec 7, 2011 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: gadget: storage: Use kcalloc instead of kzalloc to allocate array

The advantage of kcalloc is, that will prevent integer overflows which could result from the multiplication of number of elements and size and it is also a bit nicer to read.

The semantic patch that makes this change is available in https://lkml.org/lkml/2011/11/25/107

---

drivers/usb/gadget/f_fs.c 2011-11-28 20:05:17.011277814 +0100 renamed from drivers/usb/gadget/f_fs.c 2011-11-13 11:07:51.550550667 +0100 +1 -1
diff -u -p a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
@@ -1408,7 +1408,7 @@ static int ffs_epfiles_create(struct ffs
 	ENTER();
 
 	count = ffs->eps_count;
-	epfiles = kzalloc(count * sizeof *epfiles, GFP_KERNEL);
+	epfiles = kcalloc(count, sizeof(*epfiles), GFP_KERNEL);
 	if (!epfiles)
 		return -ENOMEM;
 
drivers/usb/gadget/f_mass_storage.c 2011-11-28 20:05:29.388010153 +0100 renamed from drivers/usb/gadget/f_mass_storage.c 2011-11-28 19:36:48.006781560 +0100 +1 -1
diff -u -p a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
@@ -2763,7 +2763,7 @@ static struct fsg_common *fsg_common_ini
 	 * Create the LUNs, open their backing files, and register the
 	 * LUN devices in sysfs.
 	 */
-	curlun = kzalloc(nluns * sizeof *curlun, GFP_KERNEL);
+	curlun = kcalloc(nluns, sizeof(*curlun), GFP_KERNEL);
 	if (unlikely(!curlun)) {
 		rc = -ENOMEM;
 		goto error_release;