ethtool: Fix potential kernel buffer overflow in ETHTOOL_GRXCLSRLALL
authorBen Hutchings <bhutchings@solarflare.com>
Mon, 28 Jun 2010 08:44:07 +0000 (08:44 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Jun 2010 08:00:29 +0000 (01:00 -0700)
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>
Cc: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/ethtool.c

index a0f4964033d289b8d1b4959d4d1196ccc094bdff..a3a7e9a48dff87a423f5ac78dd9c0471833a658d 100644 (file)
@@ -347,8 +347,9 @@ static noinline_for_stack int ethtool_get_rxnfc(struct net_device *dev,
 
        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;
                }