[dpdk-stable] patch 'gro: fix overflow of payload length calculation' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/11/19. 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.

Thanks.

Kevin Traynor

---
>From af703566f8bbb1cc6dda529d47fadc17117ffd09 Mon Sep 17 00:00:00 2001
From: Jiayu Hu <jiayu.hu at intel.com>
Date: Mon, 17 Dec 2018 14:05:39 +0800
Subject: [PATCH] gro: fix overflow of payload length calculation

[ upstream commit f8a05885e7fffbcba1b42bf21ac61c2523943cde ]

When the packet length is smaller than the header length,
the calculated payload length will be overflowed and result
in incorrect reassembly behaviors.

Fixes: 1e4cf4d6d4fb ("gro: cleanup")
Fixes: 9e0b9d2ec0f4 ("gro: support VxLAN GRO")

Signed-off-by: Jiayu Hu <jiayu.hu at intel.com>
---
 lib/librte_gro/gro_tcp4.c       | 3 ++-
 lib/librte_gro/gro_vxlan_tcp4.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/librte_gro/gro_tcp4.c b/lib/librte_gro/gro_tcp4.c
index 2c0f35c6d..2fe9aab3e 100644
--- a/lib/librte_gro/gro_tcp4.c
+++ b/lib/librte_gro/gro_tcp4.c
@@ -199,5 +199,6 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,
 	struct tcp_hdr *tcp_hdr;
 	uint32_t sent_seq;
-	uint16_t tcp_dl, ip_id, hdr_len, frag_off;
+	int32_t tcp_dl;
+	uint16_t ip_id, hdr_len, frag_off;
 	uint8_t is_atomic;
 
diff --git a/lib/librte_gro/gro_vxlan_tcp4.c b/lib/librte_gro/gro_vxlan_tcp4.c
index ca86f010c..955ae4b56 100644
--- a/lib/librte_gro/gro_vxlan_tcp4.c
+++ b/lib/librte_gro/gro_vxlan_tcp4.c
@@ -296,5 +296,6 @@ gro_vxlan_tcp4_reassemble(struct rte_mbuf *pkt,
 	struct vxlan_hdr *vxlan_hdr;
 	uint32_t sent_seq;
-	uint16_t tcp_dl, frag_off, outer_ip_id, ip_id;
+	int32_t tcp_dl;
+	uint16_t frag_off, outer_ip_id, ip_id;
 	uint8_t outer_is_atomic, is_atomic;
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-04 13:23:07.697424029 +0000
+++ 0010-gro-fix-overflow-of-payload-length-calculation.patch	2019-01-04 13:23:07.000000000 +0000
@@ -1,15 +1,16 @@
-From f8a05885e7fffbcba1b42bf21ac61c2523943cde Mon Sep 17 00:00:00 2001
+From af703566f8bbb1cc6dda529d47fadc17117ffd09 Mon Sep 17 00:00:00 2001
 From: Jiayu Hu <jiayu.hu at intel.com>
 Date: Mon, 17 Dec 2018 14:05:39 +0800
 Subject: [PATCH] gro: fix overflow of payload length calculation
 
+[ upstream commit f8a05885e7fffbcba1b42bf21ac61c2523943cde ]
+
 When the packet length is smaller than the header length,
 the calculated payload length will be overflowed and result
 in incorrect reassembly behaviors.
 
 Fixes: 1e4cf4d6d4fb ("gro: cleanup")
 Fixes: 9e0b9d2ec0f4 ("gro: support VxLAN GRO")
-Cc: stable at dpdk.org
 
 Signed-off-by: Jiayu Hu <jiayu.hu at intel.com>
 ---