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 DBFEB18026; Tue, 14 May 2024 11:34:53 +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=1715686494; cv=none; b=dcPHtDEP9m2hRkSfnT8ly+mOwishTT0etryZUOWL977HpCyCiJpPn4LxbHbNfQkj1iyru7vqF3y30bLHQjlHXjUN8Uv4w3uo8LBLKsbVd80Offa5D20X2mssIwERNmQkh9Jc5Al8nwpZ92ZwZERxuVEqbzXG6jNi7pstbUJjTSw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686494; c=relaxed/simple; bh=XAUP8ECSIyQ78EKbmqv2uUGorVdBUyh9u9xvyeksT+I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tOZesj+QPUSwfJLtcs4Jf/3qCLwOSc5HwOz+8nFkVRDfJ8Njmlc8Txohqwmerd2hRfS3WgwDc1QDK/KqaJJd9sw0polNTMqyCXy55v6pxBbPqvYmUkc3C3YNAuXOz5cq0tLCbZqcXtJlSNOiPzLTXOOKZcoI0oH5hFW9Hi6jdZ4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CIiYGnpe; 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="CIiYGnpe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6213BC2BD10; Tue, 14 May 2024 11:34:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715686493; bh=XAUP8ECSIyQ78EKbmqv2uUGorVdBUyh9u9xvyeksT+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CIiYGnpe+RG6HhWAFdc84Ku5rLuzCqX1gc6yyZdEFYpnm9xE7/Gb5xZk+2BllQgDs yuBTYSqhQTq98gQvov/QY1KBM5g5bn9nv1PqIxS6L1bVqBkdmQhLjyXZiu+LHsLxbb xb2DXPgRkENSth/tYy+uT7qh3eIKOL7CQXWMKQ50= 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 6.1 158/236] net: bridge: fix corrupted ethernet header on multicast-to-unicast Date: Tue, 14 May 2024 12:18:40 +0200 Message-ID: <20240514101026.361542462@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514101020.320785513@linuxfoundation.org> References: <20240514101020.320785513@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 6.1-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 982e7a9ccc41c..9661698e86e40 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -253,6 +253,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; @@ -261,12 +262,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