diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-07-06 17:13:26 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-09-27 12:18:54 -0400 |
| commit | cb95bed6f56742de743c843596387c5f752a4352 (patch) | |
| tree | 712cf43623ffba33b07dc9b8994952c1be2543ab | |
| parent | 738f115edd100dbeda0c4c5895f0c5655b180ec9 (diff) | |
net: graceful exit from netif_alloc_netdev_queues()
[ Upstream commit d339727c2b1a10f25e6636670ab6e1841170e328 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index fb9625874b3c..7b65c58a2c7a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6128,7 +6128,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) { |