diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2019-07-02 15:00:21 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-28 08:28:34 +0200 |
| commit | 7edddedc3b87b9a2226893be6f94d06cf90d02c1 (patch) | |
| tree | efa747d6fac93111785e66e208d6e9eb07dc0b5d | |
| parent | 17f2557801f833007a296ce96f133c1da7e1f489 (diff) | |
| download | linux-stable-7edddedc3b87b9a2226893be6f94d06cf90d02c1.tar.gz linux-stable-7edddedc3b87b9a2226893be6f94d06cf90d02c1.tar.bz2 linux-stable-7edddedc3b87b9a2226893be6f94d06cf90d02c1.zip | |
net: bridge: stp: don't cache eth dest pointer before skb pull
[ Upstream commit 2446a68ae6a8cee6d480e2f5b52f5007c7c41312 ]
Don't cache eth dest pointer before calling pskb_may_pull.
Fixes: cf0f02d04a83 ("[BRIDGE]: use llc for receiving STP packets")
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/bridge/br_stp_bpdu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c index 1b75d6bf12bd..37ddcea3fc96 100644 --- a/net/bridge/br_stp_bpdu.c +++ b/net/bridge/br_stp_bpdu.c @@ -147,7 +147,6 @@ void br_send_tcn_bpdu(struct net_bridge_port *p) void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb, struct net_device *dev) { - const unsigned char *dest = eth_hdr(skb)->h_dest; struct net_bridge_port *p; struct net_bridge *br; const unsigned char *buf; @@ -176,7 +175,7 @@ void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb, if (p->state == BR_STATE_DISABLED) goto out; - if (!ether_addr_equal(dest, br->group_addr)) + if (!ether_addr_equal(eth_hdr(skb)->h_dest, br->group_addr)) goto out; if (p->flags & BR_BPDU_GUARD) { |