aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorThomas Meyer <thomas@m3y3r.de>2011-11-29 15:08:00 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-12-30 14:22:21 -0500
commit1b7acf0ccd61b814032668d1d21740cfae3304e3 (patch)
treeaef9127839b8bceae722260b857fe68edc32d1ce /drivers/media
parent9884d7bea756a4657c6a5d20249bffadc460e140 (diff)
[media] xc4000: 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/common/tuners/tuner-xc2028.c2
-rw-r--r--drivers/media/common/tuners/xc4000.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c
index e531267babce..4df952c47f86 100644
--- a/drivers/media/common/tuners/tuner-xc2028.c
+++ b/drivers/media/common/tuners/tuner-xc2028.c
@@ -311,7 +311,7 @@ static int load_all_firmwares(struct dvb_frontend *fe)
311 n_array, fname, name, 311 n_array, fname, name,
312 priv->firm_version >> 8, priv->firm_version & 0xff); 312 priv->firm_version >> 8, priv->firm_version & 0xff);
313 313
314 priv->firm = kzalloc(sizeof(*priv->firm) * n_array, GFP_KERNEL); 314 priv->firm = kcalloc(n_array, sizeof(*priv->firm), GFP_KERNEL);
315 if (priv->firm == NULL) { 315 if (priv->firm == NULL) {
316 tuner_err("Not enough memory to load firmware file.\n"); 316 tuner_err("Not enough memory to load firmware file.\n");
317 rc = -ENOMEM; 317 rc = -ENOMEM;
diff --git a/drivers/media/common/tuners/xc4000.c b/drivers/media/common/tuners/xc4000.c
index 634f4d9b6c63..21a7b094a774 100644
--- a/drivers/media/common/tuners/xc4000.c
+++ b/drivers/media/common/tuners/xc4000.c
@@ -758,7 +758,7 @@ static int xc4000_fwupload(struct dvb_frontend *fe)
758 n_array, fname, name, 758 n_array, fname, name,
759 priv->firm_version >> 8, priv->firm_version & 0xff); 759 priv->firm_version >> 8, priv->firm_version & 0xff);
760 760
761 priv->firm = kzalloc(sizeof(*priv->firm) * n_array, GFP_KERNEL); 761 priv->firm = kcalloc(n_array, sizeof(*priv->firm), GFP_KERNEL);
762 if (priv->firm == NULL) { 762 if (priv->firm == NULL) {
763 printk(KERN_ERR "Not enough memory to load firmware file.\n"); 763 printk(KERN_ERR "Not enough memory to load firmware file.\n");
764 rc = -ENOMEM; 764 rc = -ENOMEM;