summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2015-07-06 18:13:26 +0300
committerDavid S. Miller <davem@davemloft.net>2015-07-09 01:46:17 +0300
commitd339727c2b1a10f25e6636670ab6e1841170e328 (patch)
tree94db136cbede171936df076cfc34dfe351a17265 /net
parent142b942a75cb10ede1b42bf85368d41449ab4e3b (diff)
downloadlinux-d339727c2b1a10f25e6636670ab6e1841170e328.tar.xz
net: graceful exit from netif_alloc_netdev_queues()
User space can crash kernel with ip link add ifb10 numtxqueues 100000 type ifb We must replace a BUG_ON() by proper test and return -EINVAL for crazy values. Fixes: 60877a32bce00 ("net: allow large number of tx queues") Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 6778a9999d52..0ad626214332 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6409,7 +6409,8 @@ static int netif_alloc_netdev_queues(struct net_device *dev)
struct netdev_queue *tx;
size_t sz = count * sizeof(*tx);
- BUG_ON(count < 1 || count > 0xffff);
+ if (count < 1 || count > 0xffff)
+ return -EINVAL;
tx = kzalloc(sz, GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
if (!tx) {