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 acb38004eec08ba72819477df0af6eacd00bcd34..da9d04815ea54ff42a3493dcff783eb553fc6a8a 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 860e15ac8f245b5b2fcd95aee9e12aeb807dc925..a18ebeed82b56b31a6ab4a0d05cd9b89fc82efa6 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;