[dpdk-stable] patch 'examples/ipsec-secgw: fix unchecked return value' has been queued to LTS release 18.11.6
Kevin Traynor
ktraynor at redhat.com
Fri Nov 22 15:41:13 CET 2019
Hi,
FYI, your patch has been queued to LTS release 18.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/29/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/03f8a9270eb03b0706a4cc151a847064f5678533
Thanks.
Kevin.
---
>From 03f8a9270eb03b0706a4cc151a847064f5678533 Mon Sep 17 00:00:00 2001
From: Bernard Iremonger <bernard.iremonger at intel.com>
Date: Wed, 7 Aug 2019 13:30:12 +0100
Subject: [PATCH] examples/ipsec-secgw: fix unchecked return value
[ upstream commit 23742f21f74a9d8380367c39b8ee4561e6dd1526 ]
Check the return value of the rte_eth_dev_rss_hash_conf_get function.
Coverity issue: 344970
Fixes: 3a690d5a65e2 ("examples/ipsec-secgw: fix first packet with inline crypto")
Signed-off-by: Bernard Iremonger <bernard.iremonger at intel.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
examples/ipsec-secgw/ipsec.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
index 872a8b819..0f94a76a9 100644
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -201,6 +201,12 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
sa->action[1].type = RTE_FLOW_ACTION_TYPE_RSS;
sa->action[1].conf = &action_rss;
- rte_eth_dev_rss_hash_conf_get(sa->portid,
+ ret = rte_eth_dev_rss_hash_conf_get(sa->portid,
&rss_conf);
+ if (ret != 0) {
+ RTE_LOG(ERR, IPSEC,
+ "rte_eth_dev_rss_hash_conf_get:ret=%d\n",
+ ret);
+ return -1;
+ }
for (i = 0, j = 0;
i < dev_info.nb_rx_queues; ++i)
--
2.21.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-11-22 14:36:56.667222285 +0000
+++ 0027-examples-ipsec-secgw-fix-unchecked-return-value.patch 2019-11-22 14:36:55.195149329 +0000
@@ -1 +1 @@
-From 23742f21f74a9d8380367c39b8ee4561e6dd1526 Mon Sep 17 00:00:00 2001
+From 03f8a9270eb03b0706a4cc151a847064f5678533 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 23742f21f74a9d8380367c39b8ee4561e6dd1526 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15,2 +16,2 @@
- examples/ipsec-secgw/ipsec.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
+ examples/ipsec-secgw/ipsec.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
@@ -19 +20 @@
-index dc85adfe5..5f9d560dd 100644
+index 872a8b819..0f94a76a9 100644
@@ -22,14 +23,14 @@
-@@ -249,5 +249,12 @@ create_inline_session(struct socket_ctx *skt_ctx, struct ipsec_sa *sa)
- sa->action[1].type = RTE_FLOW_ACTION_TYPE_RSS;
- sa->action[1].conf = &action_rss;
-- rte_eth_dev_rss_hash_conf_get(sa->portid, &rss_conf);
-+ ret = rte_eth_dev_rss_hash_conf_get(sa->portid,
-+ &rss_conf);
-+ if (ret != 0) {
-+ RTE_LOG(ERR, IPSEC,
-+ "rte_eth_dev_rss_hash_conf_get:ret=%d\n",
-+ ret);
-+ return -1;
-+ }
- for (i = 0, j = 0; i < dev_info.nb_rx_queues; ++i)
- queue[j++] = i;
+@@ -201,6 +201,12 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
+ sa->action[1].type = RTE_FLOW_ACTION_TYPE_RSS;
+ sa->action[1].conf = &action_rss;
+- rte_eth_dev_rss_hash_conf_get(sa->portid,
++ ret = rte_eth_dev_rss_hash_conf_get(sa->portid,
+ &rss_conf);
++ if (ret != 0) {
++ RTE_LOG(ERR, IPSEC,
++ "rte_eth_dev_rss_hash_conf_get:ret=%d\n",
++ ret);
++ return -1;
++ }
+ for (i = 0, j = 0;
+ i < dev_info.nb_rx_queues; ++i)
More information about the stable
mailing list