Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit df32cc193ad88f7b1326b90af799c927b27f7654

Authored by Tom Herbert
Committed by David S. Miller
1 parent 315daea948
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -2131,7 +2131,7 @@
2131 2131 } else {
2132 2132 struct sock *sk = skb->sk;
2133 2133 queue_index = sk_tx_queue_get(sk);
2134   - if (queue_index < 0) {
  2134 + if (queue_index < 0 || queue_index >= dev->real_num_tx_queues) {
2135 2135  
2136 2136 queue_index = 0;
2137 2137 if (dev->real_num_tx_queues > 1)