Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1614453 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by Greg Kroah-Hartman
Browse files

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: cf0f02d0 ("[BRIDGE]: use llc for receiving STP packets")
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2aabe0db

net/bridge/br_stp_bpdu.c

+1 −2
Original line number Diff line number Diff line
@@ -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) {