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

Commit e96b4e3e authored by Felix Fietkau's avatar Felix Fietkau Committed by Greg Kroah-Hartman
Browse files

net: bridge: fix corrupted ethernet header on multicast-to-unicast 



[ Upstream commit 86b29d830ad69eecff25b22dc96c14c6573718e6 ]

The change from skb_copy to pskb_copy unfortunately changed the data
copying to omit the ethernet header, since it was pulled before reaching
this point. Fix this by calling __skb_push/pull around pskb_copy.

Fixes: 59c878cbcdd8 ("net: bridge: fix multicast-to-unicast with fraglist GSO")
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Acked-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ec1f71c0

net/bridge/br_forward.c

+7 −2
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, 
{

	struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;

	const unsigned char *src = eth_hdr(skb)->h_source;

	struct sk_buff *nskb;



	if (!should_deliver(p, skb))

		return;
@@ -259,12 +260,16 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, 
	if (skb->dev == p->dev && ether_addr_equal(src, addr))

		return;



	skb = pskb_copy(skb, GFP_ATOMIC);

	if (!skb) {

	__skb_push(skb, ETH_HLEN);

	nskb = pskb_copy(skb, GFP_ATOMIC);

	__skb_pull(skb, ETH_HLEN);

	if (!nskb) {

		DEV_STATS_INC(dev, tx_dropped);

		return;

	}



	skb = nskb;

	__skb_pull(skb, ETH_HLEN);

	if (!is_broadcast_ether_addr(addr))

		memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN);