[media] xc4000: Use kcalloc instead of kzalloc to allocate array
authorThomas Meyer <thomas@m3y3r.de>
Tue, 29 Nov 2011 20:08:00 +0000 (17:08 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 30 Dec 2011 19:22:21 +0000 (17:22 -0200)
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/common/tuners/tuner-xc2028.c
drivers/media/common/tuners/xc4000.c

index e531267babce35b22a305b1491e72008addcd4fa..4df952c47f8628eb7c6d187b0cc302185eec9aba 100644 (file)
@@ -311,7 +311,7 @@ static int load_all_firmwares(struct dvb_frontend *fe)
                   n_array, fname, name,
                   priv->firm_version >> 8, priv->firm_version & 0xff);
 
-       priv->firm = kzalloc(sizeof(*priv->firm) * n_array, GFP_KERNEL);
+       priv->firm = kcalloc(n_array, sizeof(*priv->firm), GFP_KERNEL);
        if (priv->firm == NULL) {
                tuner_err("Not enough memory to load firmware file.\n");
                rc = -ENOMEM;
index 634f4d9b6c6380678bf879e50293e9254a813e13..21a7b094a774764d29077a55b5cb8bb3b77ba574 100644 (file)
@@ -758,7 +758,7 @@ static int xc4000_fwupload(struct dvb_frontend *fe)
                n_array, fname, name,
                priv->firm_version >> 8, priv->firm_version & 0xff);
 
-       priv->firm = kzalloc(sizeof(*priv->firm) * n_array, GFP_KERNEL);
+       priv->firm = kcalloc(n_array, sizeof(*priv->firm), GFP_KERNEL);
        if (priv->firm == NULL) {
                printk(KERN_ERR "Not enough memory to load firmware file.\n");
                rc = -ENOMEM;