This is a note to let you know that I've just added the patch titled
bridge: fix potential crash in __netdev_pick_tx()
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bridge-fix-potential-crash-in-__netdev_pick_tx.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sat Sep 26 11:13:07 PDT 2015
From: Eric Dumazet <edumazet@xxxxxxxxxx>
Date: Thu, 9 Jul 2015 18:56:07 +0200
Subject: bridge: fix potential crash in __netdev_pick_tx()
From: Eric Dumazet <edumazet@xxxxxxxxxx>
[ Upstream commit a7d35f9d73e9ffa74a02304b817e579eec632f67 ]
Commit c29390c6dfee ("xps: must clear sender_cpu before forwarding")
fixed an issue in normal forward path, caused by sender_cpu & napi_id
skb fields being an union.
Bridge is another point where skb can be forwarded, so we need
the same cure.
Bug triggers if packet was received on a NIC using skb_mark_napi_id()
Fixes: 2bd82484bb4c ("xps: fix xps for stacked devices")
Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
Reported-by: Bob Liu <bob.liu@xxxxxxxxxx>
Tested-by: Bob Liu <bob.liu@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/bridge/br_forward.c | 1 +
1 file changed, 1 insertion(+)
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -42,6 +42,7 @@ int br_dev_queue_push_xmit(struct sock *
} else {
skb_push(skb, ETH_HLEN);
br_drop_fake_rtable(skb);
+ skb_sender_cpu_clear(skb);
dev_queue_xmit(skb);
}
Patches currently in stable-queue which might be from edumazet@xxxxxxxxxx are
queue-4.1/udp-fix-dst-races-with-multicast-early-demux.patch
queue-4.1/fq_codel-fix-a-use-after-free.patch
queue-4.1/inet-fix-possible-request-socket-leak.patch
queue-4.1/ipv6-lock-socket-in-ip6_datagram_connect.patch
queue-4.1/net-fix-skb-csum-races-when-peeking.patch
queue-4.1/inet-fix-races-with-reqsk-timers.patch
queue-4.1/net-graceful-exit-from-netif_alloc_netdev_queues.patch
queue-4.1/bridge-fix-potential-crash-in-__netdev_pick_tx.patch
queue-4.1/inet-frags-fix-defragmented-packet-s-ip-header-for-af_packet.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html