aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenliang Fan <fanwlexca@gmail.com>2013-12-18 13:56:12 +0800
committerJohn W. Linville <linville@tuxdriver.com>2014-01-03 15:36:56 -0500
commit1558efd0d48671845d2bd9ad80ba042577afd578 (patch)
tree08b013dced0bfc309a356cc32e9ae078ea928753
parentMerge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next (diff)
downloadlinux-dev-1558efd0d48671845d2bd9ad80ba042577afd578.tar.xz
linux-dev-1558efd0d48671845d2bd9ad80ba042577afd578.zip
drivers/net/wireless/hostap: Integer overflow
The local variable 'value' comes from 'extra', a parameter of function 'prism2_ioctl_priv_prism2_param'. If a large number passed to 'value', there would be an integer overflow in the following line: local->passive_scan_timer.expires = jiffies + local->passive_scan_interval * HZ Signed-off-by: Wenliang Fan <fanwlexca@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/hostap/hostap_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index e5090309824e..63e350affc7e 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -2567,7 +2567,7 @@ static int prism2_ioctl_priv_prism2_param(struct net_device *dev,
local->passive_scan_interval = value;
if (timer_pending(&local->passive_scan_timer))
del_timer(&local->passive_scan_timer);
- if (value > 0) {
+ if (value > 0 && value < INT_MAX / HZ) {
local->passive_scan_timer.expires = jiffies +
local->passive_scan_interval * HZ;
add_timer(&local->passive_scan_timer);