[PATCH] usb: gadget: storage: Use kcalloc instead of kzalloc toallocate array

From: Thomas Meyer
Date: Mon Dec 05 2011 - 12:33:04 EST


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

Signed-off-by: Thomas Meyer <thomas@xxxxxxxx>
---

diff -u -p a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
--- a/drivers/usb/gadget/f_fs.c 2011-11-13 11:07:51.550550667 +0100
+++ b/drivers/usb/gadget/f_fs.c 2011-11-28 20:05:17.011277814 +0100
@@ -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;

diff -u -p a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
--- a/drivers/usb/gadget/f_mass_storage.c 2011-11-28 19:36:48.006781560 +0100
+++ b/drivers/usb/gadget/f_mass_storage.c 2011-11-28 20:05:29.388010153 +0100
@@ -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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/