diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-07-06 17:13:26 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-08-27 09:26:56 +0200 |
| commit | 161a5358f11f2958c1699724d2661f907c948d73 (patch) | |
| tree | 90c77c09e36b05ecfd41c56be6f954be62d378a9 | |
| parent | e27e696c238ec5d7c2d445135be808de6047ced3 (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: Jiri Slaby <jslaby@suse.cz>
| -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 3ca487e14080..5a407f0f1c2d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5559,7 +5559,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) { |