---

yaml --- r: 200858 b: refs/heads/master c: db048b6 h: refs/heads/master v: v3
git-mirror · Jun 29, 2010 · 84a31f8 · 84a31f8
1 parent 13e8d3e
commit 84a31f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c22d7ac844f1cb9c6a5fd20f89ebadc2feef891b
+refs/heads/master: db048b69037e7fa6a7d9e95a1271a50dc08ae233
diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c
@@ -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;
 		}