patch 'cryptodev: fix empty devargs parsing' has been queued to stable release 21.11.4
Kevin Traynor
ktraynor at redhat.com
Wed Mar 15 15:36:19 CET 2023
Hi,
FYI, your patch has been queued to stable release 21.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 03/20/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/52480ab3aef902d59b91f2b8a1115ce036ee0685
Thanks.
Kevin
---
>From 52480ab3aef902d59b91f2b8a1115ce036ee0685 Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen at huawei.com>
Date: Thu, 2 Mar 2023 07:50:07 +0000
Subject: [PATCH] cryptodev: fix empty devargs parsing
[ upstream commit 8146454c56636ba8af5263b57e1c4a9f67fd4a39 ]
The rte_kvargs_process() was used to parse KV pairs, it also supports
to parse 'only keys' (e.g. socket_id) type. And the callback function
parameter 'value' is NULL when parsed 'only keys'.
This patch fixes segment fault in rte_cryptodev_pmd_parse_uint_arg()
when parse input args with 'only keys' (e.g. socket_id,
max_nb_queue_pairs).
For a similar reason, this patch fixes
rte_cryptodev_pmd_parse_name_arg().
Fixes: 9e6edea41805 ("cryptodev: add APIs to assist PMD initialisation")
Signed-off-by: Chengwen Feng <fengchengwen at huawei.com>
Acked-by: Akhil Goyal <gakhil at marvell.com>
---
lib/cryptodev/cryptodev_pmd.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/lib/cryptodev/cryptodev_pmd.c b/lib/cryptodev/cryptodev_pmd.c
index 3b8ccdcede..d1d8ecef98 100644
--- a/lib/cryptodev/cryptodev_pmd.c
+++ b/lib/cryptodev/cryptodev_pmd.c
@@ -20,4 +20,7 @@ rte_cryptodev_pmd_parse_name_arg(const char *key __rte_unused,
int n;
+ if (value == NULL || extra_args == NULL)
+ return -EINVAL;
+
n = strlcpy(params->name, value, RTE_CRYPTODEV_NAME_MAX_LEN);
if (n >= RTE_CRYPTODEV_NAME_MAX_LEN)
@@ -36,4 +39,8 @@ rte_cryptodev_pmd_parse_uint_arg(const char *key __rte_unused,
int i;
char *end;
+
+ if (value == NULL || extra_args == NULL)
+ return -EINVAL;
+
errno = 0;
--
2.39.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-03-15 14:30:21.234371989 +0000
+++ 0026-cryptodev-fix-empty-devargs-parsing.patch 2023-03-15 14:30:20.588123710 +0000
@@ -1 +1 @@
-From 8146454c56636ba8af5263b57e1c4a9f67fd4a39 Mon Sep 17 00:00:00 2001
+From 52480ab3aef902d59b91f2b8a1115ce036ee0685 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8146454c56636ba8af5263b57e1c4a9f67fd4a39 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index 77b269f312..d8073a601d 100644
+index 3b8ccdcede..d1d8ecef98 100644
@@ -30 +31 @@
-@@ -23,4 +23,7 @@ rte_cryptodev_pmd_parse_name_arg(const char *key __rte_unused,
+@@ -20,4 +20,7 @@ rte_cryptodev_pmd_parse_name_arg(const char *key __rte_unused,
@@ -38 +39 @@
-@@ -39,4 +42,8 @@ rte_cryptodev_pmd_parse_uint_arg(const char *key __rte_unused,
+@@ -36,4 +39,8 @@ rte_cryptodev_pmd_parse_uint_arg(const char *key __rte_unused,
More information about the stable
mailing list