usb: gadget: 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

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Acked-by: Michal Nazarewicz <[4]mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index acb3800..da9d048 100644 (file)
--- 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_data *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 --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 860e15a..a18ebee 100644 (file)
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -2775,7 +2775,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
         * 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;