From: <gregkh@linuxfoundation.org>
To: edumazet@google.com, bob.liu@oracle.com, davem@davemloft.net,
gregkh@linuxfoundation.org
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "bridge: fix potential crash in __netdev_pick_tx()" has been added to the 4.1-stable tree
Date: Sat, 26 Sep 2015 11:40:47 -0700 [thread overview]
Message-ID: <144329284761112@kroah.com> (raw)
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@vger.kernel.org> know about it.
>From foo@baz Sat Sep 26 11:13:07 PDT 2015
From: Eric Dumazet <edumazet@google.com>
Date: Thu, 9 Jul 2015 18:56:07 +0200
Subject: bridge: fix potential crash in __netdev_pick_tx()
From: Eric Dumazet <edumazet@google.com>
[ 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@google.com>
Reported-by: Bob Liu <bob.liu@oracle.com>
Tested-by: Bob Liu <bob.liu@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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@google.com 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
reply other threads:[~2015-09-26 18:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=144329284761112@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=bob.liu@oracle.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.