[dpdk-stable] patch 'net/fm10k: fix address of first segment' has been queued to LTS release 18.11.3
Kevin Traynor
ktraynor at redhat.com
Thu Sep 5 12:17:46 CEST 2019
Hi,
FYI, your patch has been queued to LTS release 18.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/12/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.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/d78c697610e3bb55641059113677ec10c59baf90
Thanks.
Kevin Traynor
---
>From d78c697610e3bb55641059113677ec10c59baf90 Mon Sep 17 00:00:00 2001
From: Xiao Zhang <xiao.zhang at intel.com>
Date: Tue, 6 Aug 2019 07:20:54 +0800
Subject: [PATCH] net/fm10k: fix address of first segment
[ upstream commit 1c38061e790fc3f28d77eb7ded6cb8601c7c6692 ]
This patch fixes (dereference after null check) coverity issue.
The address of first segmented packets was not set correctly during
reassembling packets which led to this issue.
Coverity issue: 343416
Fixes: fe65e1e1ce61 ("fm10k: add vector scatter Rx")
Signed-off-by: Xiao Zhang <xiao.zhang at intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
---
drivers/net/fm10k/fm10k_rxtx_vec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c
index 788e2484a..45542bef3 100644
--- a/drivers/net/fm10k/fm10k_rxtx_vec.c
+++ b/drivers/net/fm10k/fm10k_rxtx_vec.c
@@ -679,4 +679,5 @@ fm10k_recv_scattered_pkts_vec(void *rx_queue,
if (i == nb_bufs)
return nb_bufs;
+ rxq->pkt_first_seg = rx_pkts[i];
}
return i + fm10k_reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i,
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-09-05 10:36:50.286934706 +0100
+++ 0046-net-fm10k-fix-address-of-first-segment.patch 2019-09-05 10:36:47.551699541 +0100
@@ -1 +1 @@
-From 1c38061e790fc3f28d77eb7ded6cb8601c7c6692 Mon Sep 17 00:00:00 2001
+From d78c697610e3bb55641059113677ec10c59baf90 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1c38061e790fc3f28d77eb7ded6cb8601c7c6692 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list