From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 73451135410; Tue, 14 May 2024 11:41:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686912; cv=none; b=UzGNW7kSDy87Kg7cv09RB0Q630Ra69Qt8ANoEtJVZnbbYg2POeOgn4LEFkqaU7Ow8me9fic/ofzthpQG9ZJKqcpGdWp3TbPwWfcJZq9UUi4YYGhWllJ3u8BDoY4Fv2LKkJWqN69TqKsYXnB0F5mFB6GIiUbZ5qwnrClVjSi46OI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686912; c=relaxed/simple; bh=mm3BcyuHth4uzrRrVG+VPp4SfG9btx5u4cZZDh4I53M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jXnLO8iBBTdkkb0AWLeMTpGfQgAT3bU3AsFOj9Wa5Aw6aRMZDSk0MEpbG122zxIS/R3rUdIv6QNAnCPc6QTITtjJE1AxfR0MAiunAZwQ8WE2E1z6Qcwb2/uaAUOo2HTqEbq0hsHo+lZc6BpyMZIWF+jM0EVUQgFVv51yTFC+WEo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=N1OeRlHF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="N1OeRlHF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A8DFC2BD10; Tue, 14 May 2024 11:41:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715686912; bh=mm3BcyuHth4uzrRrVG+VPp4SfG9btx5u4cZZDh4I53M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N1OeRlHFAmh1AAf/E91lnjqYXwCV4rdBR6NB2ojKFM0w/fnd5zASDbDcBk1Ud13bw luBBw7n9wWv5FAzZt7QNnkaOJ6BMLxODgtJE9mBX9VppeBy8542Z/Qf+gcWTl/Lep2 sMpflfE/ldcmdaQQnmQkD5hMV0dYMojgqyGnOg8c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Felix Fietkau , Nikolay Aleksandrov , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 52/63] net: bridge: fix corrupted ethernet header on multicast-to-unicast Date: Tue, 14 May 2024 12:20:13 +0200 Message-ID: <20240514100949.977369016@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514100948.010148088@linuxfoundation.org> References: <20240514100948.010148088@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Felix Fietkau [ 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: Felix Fietkau Acked-by: Nikolay Aleksandrov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/bridge/br_forward.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index fc2ebd732098f..a300ef6fb8ffa 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -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); -- 2.43.0