]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net: bridge: fix stale eth hdr pointer in br_dev_xmit
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Mon, 24 Feb 2020 16:46:22 +0000 (18:46 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Feb 2022 11:51:45 +0000 (12:51 +0100)
commitc13ec2c0f4858fe07a6a997ae47d5075ba320550
tree443c9b35622952ad09d810ae692ddceecd9f5e1e
parentbd5579d43baa42e57e6d90e1204f13123315d71f
net: bridge: fix stale eth hdr pointer in br_dev_xmit

commit 823d81b0fa2cd83a640734e74caee338b5d3c093 upstream.

In br_dev_xmit() we perform vlan filtering in br_allowed_ingress() but
if the packet has the vlan header inside (e.g. bridge with disabled
tx-vlan-offload) then the vlan filtering code will use skb_vlan_untag()
to extract the vid before filtering which in turn calls pskb_may_pull()
and we may end up with a stale eth pointer. Moreover the cached eth header
pointer will generally be wrong after that operation. Remove the eth header
caching and just use eth_hdr() directly, the compiler does the right thing
and calculates it only once so we don't lose anything.

Fixes: 057658cb33fb ("bridge: suppress arp pkts on BR_NEIGH_SUPPRESS ports")
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Eduardo Vela <Nava> <evn@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/bridge/br_device.c