diff options
| author | Tom Herbert <therbert@google.com> | 2010-11-01 12:55:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-01 12:55:52 -0700 |
| commit | df32cc193ad88f7b1326b90af799c927b27f7654 (patch) | |
| tree | 535d945c8507f8ac85575aed481bad9892a5e243 /net | |
| parent | 315daea9481277d9b8109b47e974835a901e4bc5 (diff) | |
| download | op-kernel-dev-df32cc193ad88f7b1326b90af799c927b27f7654.zip op-kernel-dev-df32cc193ad88f7b1326b90af799c927b27f7654.tar.gz | |
net: check queue_index from sock is valid for device
In dev_pick_tx recompute the queue index if the value stored in the
socket is greater than or equal to the number of real queues for the
device. The saved index in the sock structure is not guaranteed to
be appropriate for the egress device (this could happen on a route
change or in presence of tunnelling). The result of the queue index
being bad would be to return a bogus queue (crash could prersumably
follow).
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 35dfb83..0dd54a6 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2131,7 +2131,7 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev, } else { struct sock *sk = skb->sk; queue_index = sk_tx_queue_get(sk); - if (queue_index < 0) { + if (queue_index < 0 || queue_index >= dev->real_num_tx_queues) { queue_index = 0; if (dev->real_num_tx_queues > 1) |
