patch 'net/cnxk: fix uninitialized variable' has been queued to stable release 21.11.6

Kevin Traynor ktraynor at redhat.com
Thu Nov 2 14:11:50 CET 2023


Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. 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/723ae321d20065b0c4c48b8788d071e578959ff4

Thanks.

Kevin

---
>From 723ae321d20065b0c4c48b8788d071e578959ff4 Mon Sep 17 00:00:00 2001
From: Akhil Goyal <gakhil at marvell.com>
Date: Fri, 11 Aug 2023 14:28:00 +0530
Subject: [PATCH] net/cnxk: fix uninitialized variable

[ upstream commit 06f089b8e80d102a899c97b8691b4e1b82f25d7e ]

sa_base may be uninitialized in for cases. Initialize it.

Fixes: 4382a7ccf781 ("net/cnxk: support Rx security offload on cn10k")

Signed-off-by: Akhil Goyal <gakhil at marvell.com>
---
 drivers/net/cnxk/cn10k_rx.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h
index 42812d5bd3..9d71a9352e 100644
--- a/drivers/net/cnxk/cn10k_rx.h
+++ b/drivers/net/cnxk/cn10k_rx.h
@@ -425,5 +425,5 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
 	struct rte_mbuf *mbuf;
 	uint64_t aura_handle;
-	uint64_t sa_base;
+	uint64_t sa_base = 0;
 	uint16_t lmt_id;
 	uint64_t laddr;
@@ -549,7 +549,7 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
 	uint8x16_t f0, f1, f2, f3;
 	uint16_t lmt_id, d_off;
+	uintptr_t sa_base = 0;
 	uint16_t packets = 0;
 	uint16_t pkts_left;
-	uintptr_t sa_base;
 	uint32_t head;
 	uintptr_t cq0;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.920717938 +0000
+++ 0044-net-cnxk-fix-uninitialized-variable.patch	2023-11-02 13:09:40.845163438 +0000
@@ -1 +1 @@
-From 06f089b8e80d102a899c97b8691b4e1b82f25d7e Mon Sep 17 00:00:00 2001
+From 723ae321d20065b0c4c48b8788d071e578959ff4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 06f089b8e80d102a899c97b8691b4e1b82f25d7e ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -17 +18 @@
-index a2ecb25211..cc224eb154 100644
+index 42812d5bd3..9d71a9352e 100644
@@ -20 +21 @@
-@@ -995,6 +995,6 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
+@@ -425,5 +425,5 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
@@ -23,2 +23,0 @@
-+	uint64_t sa_base = 0;
- 	uintptr_t cpth = 0;
@@ -25,0 +25 @@
++	uint64_t sa_base = 0;
@@ -28 +28,2 @@
-@@ -1144,7 +1144,7 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
+@@ -549,7 +549,7 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
+ 	uint8x16_t f0, f1, f2, f3;
@@ -30 +30,0 @@
- 	uint64_t lbase, laddr;



More information about the stable mailing list