]> git.karo-electronics.de Git - linux-beck.git/commitdiff
net: dev_pick_tx() fix
authorEric Dumazet <eric.dumazet@gmail.com>
Sun, 11 Apr 2010 21:18:17 +0000 (21:18 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Apr 2010 08:27:11 +0000 (01:27 -0700)
When dev_pick_tx() caches tx queue_index on a socket, we must check
socket dst_entry matches skb one, or risk a crash later, as reported by
Denys Fedorysychenko, if old packets are in flight during a route
change, involving devices with different number of queues.

Bug introduced by commit a4ee3ce3
(net: Use sk_tx_queue_mapping for connected sockets)

Reported-by: Denys Fedorysychenko <nuclearcat@nuclearcat.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index 1c8a0ce473a860a28a19e4fd9b3943a1f2752a7b..92584bfef09bcaf1c23e6301006b309056c3fe1b 100644 (file)
@@ -1989,8 +1989,12 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev,
                        if (dev->real_num_tx_queues > 1)
                                queue_index = skb_tx_hash(dev, skb);
 
-                       if (sk && sk->sk_dst_cache)
-                               sk_tx_queue_set(sk, queue_index);
+                       if (sk) {
+                               struct dst_entry *dst = rcu_dereference(sk->sk_dst_cache);
+
+                               if (dst && skb_dst(skb) == dst)
+                                       sk_tx_queue_set(sk, queue_index);
+                       }
                }
        }