patch 'gro: fix payload corruption in coalescing packets' has been queued to stable release 24.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/05/25. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/762a9230466908583f80754a51f3349754e5b4c3

Thanks.

Kevin

---
>From 762a9230466908583f80754a51f3349754e5b4c3 Mon Sep 17 00:00:00 2001
From: Tathagat Priyadarshi <tathagat.dpdk at gmail.com>
Date: Tue, 2 Sep 2025 10:44:51 +0000
Subject: [PATCH] gro: fix payload corruption in coalescing packets

[ upstream commit 33358ccc291fbc39d93b3c3975bebec1c38ab56d ]

In the current implementation when cmp is larger than 0,
the new packet is appended to the original packet. However
the code is operating on the trailing packet to update the tcp flags
which ends up corrupting the payload of the trailing packets.

Fixes: 547f29435769 ("gro: fix reordering of packets")

Signed-off-by: Tathagat Priyadarshi <tathagat.dpdk at gmail.com>
Reviewed-by: Kumara Parameshwaran <kumaraparamesh92 at gmail.com>
---
 lib/gro/gro_tcp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h
index e9be7b95d1..43383e47e0 100644
--- a/lib/gro/gro_tcp.h
+++ b/lib/gro/gro_tcp.h
@@ -134,5 +134,5 @@ merge_two_tcp_packets(struct gro_tcp_item *item,
 	pkt_head->pkt_len += pkt_tail->pkt_len;
 	if (tcp_flags != RTE_TCP_ACK_FLAG) {
-		tcp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_tcp_hdr *,
+		tcp_hdr = rte_pktmbuf_mtod_offset(pkt_head, struct rte_tcp_hdr *,
 						l2_offset + pkt_head->l2_len + pkt_head->l3_len);
 		tcp_hdr->tcp_flags |= tcp_flags;
-- 
2.51.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-10-31 13:53:53.863266731 +0000
+++ 0051-gro-fix-payload-corruption-in-coalescing-packets.patch	2025-10-31 13:53:52.162329417 +0000
@@ -1 +1 @@
-From 33358ccc291fbc39d93b3c3975bebec1c38ab56d Mon Sep 17 00:00:00 2001
+From 762a9230466908583f80754a51f3349754e5b4c3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 33358ccc291fbc39d93b3c3975bebec1c38ab56d ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org