Commit df32cc19 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller

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: default avatarTom Herbert <therbert@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 315daea9
...@@ -2131,7 +2131,7 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev, ...@@ -2131,7 +2131,7 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev,
} else { } else {
struct sock *sk = skb->sk; struct sock *sk = skb->sk;
queue_index = sk_tx_queue_get(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; queue_index = 0;
if (dev->real_num_tx_queues > 1) if (dev->real_num_tx_queues > 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment