aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00dev.c
diff options
context:
space:
mode:
authorThomas Meyer <thomas@m3y3r.de>2011-11-29 16:08:00 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-06 16:02:51 -0500
commit839fafbe0dc35fabeb9bd3be9727fd74d12c0b9d (patch)
treefc15049d0e71d716c4de7e39484ee8cba78d1215 /drivers/net/wireless/rt2x00/rt2x00dev.c
parent5f779bbd472cdb2046ff8b672ad8c5b62b61cd19 (diff)
rt2x00: 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: Gertjan van Wingerde <gwingerde@gmail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index edd317fa7c0a..c3e1aa7c1a80 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -831,11 +831,11 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
831 if (spec->supported_rates & SUPPORT_RATE_OFDM) 831 if (spec->supported_rates & SUPPORT_RATE_OFDM)
832 num_rates += 8; 832 num_rates += 8;
833 833
834 channels = kzalloc(sizeof(*channels) * spec->num_channels, GFP_KERNEL); 834 channels = kcalloc(spec->num_channels, sizeof(*channels), GFP_KERNEL);
835 if (!channels) 835 if (!channels)
836 return -ENOMEM; 836 return -ENOMEM;
837 837
838 rates = kzalloc(sizeof(*rates) * num_rates, GFP_KERNEL); 838 rates = kcalloc(num_rates, sizeof(*rates), GFP_KERNEL);
839 if (!rates) 839 if (!rates)
840 goto exit_free_channels; 840 goto exit_free_channels;
841 841