aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-06-28 08:44:07 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-02 10:29:49 -0700
commitb2ae72c4a8c172cd4fbe987c0f90764e5b63c55c (patch)
treeb74b18bae4a5ac610ff3161cb68c35422ab21fef /net
parent4d8712a629029881f096736ea7aebe57f2dde2e2 (diff)
ethtool: Fix potential kernel buffer overflow in ETHTOOL_GRXCLSRLALL
commit db048b69037e7fa6a7d9e95a1271a50dc08ae233 upstream. On a 32-bit machine, info.rule_cnt >= 0x40000000 leads to integer overflow and the buffer may be smaller than needed. Since ETHTOOL_GRXCLSRLALL is unprivileged, this can presumably be used for at least denial of service. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
-rw-r--r--net/core/ethtool.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 9d55c57f318..6ce21faa545 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -328,8 +328,9 @@ static noinline_for_stack int ethtool_get_rxnfc(struct net_device *dev, void __u
if (info.cmd == ETHTOOL_GRXCLSRLALL) {
if (info.rule_cnt > 0) {
- rule_buf = kmalloc(info.rule_cnt * sizeof(u32),
- GFP_USER);
+ if (info.rule_cnt <= KMALLOC_MAX_SIZE / sizeof(u32))
+ rule_buf = kmalloc(info.rule_cnt * sizeof(u32),
+ GFP_USER);
if (!rule_buf)
return -ENOMEM;
}