patch 'app/dumpcap: verify strdup return' has been queued to stable release 21.11.7

Kevin Traynor ktraynor at redhat.com
Tue Mar 5 16:33:51 CET 2024


Hi,

FYI, your patch has been queued to stable release 21.11.7

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/11/24. 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/59b5633558a0ce472d328a69f4dda1c3084d5765

Thanks.

Kevin

---
>From 59b5633558a0ce472d328a69f4dda1c3084d5765 Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen at huawei.com>
Date: Fri, 10 Nov 2023 10:01:10 +0000
Subject: [PATCH] app/dumpcap: verify strdup return

[ upstream commit 6bb5ffe3ea9a5ad41848c19c2787df42de2a3cab ]

Add verify strdup return value logic.

Fixes: cbb44143be74 ("app/dumpcap: add new packet capture application")

Signed-off-by: Chengwen Feng <fengchengwen at huawei.com>
---
 app/dumpcap/main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c
index 74dd72b3ac..44576bed42 100644
--- a/app/dumpcap/main.c
+++ b/app/dumpcap/main.c
@@ -528,4 +528,9 @@ static void dpdk_init(void)
 		eal_argv[i] = strdup(args[i]);
 
+	for (i = 0; i < (unsigned int)eal_argc; i++) {
+		if (eal_argv[i] == NULL)
+			rte_panic("No memory\n");
+	}
+
 	if (rte_eal_init(eal_argc, eal_argv) < 0)
 		rte_exit(EXIT_FAILURE, "EAL init failed: is primary process running?\n");
-- 
2.43.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-05 14:08:55.145524824 +0000
+++ 0018-app-dumpcap-verify-strdup-return.patch	2024-03-05 14:08:54.627520704 +0000
@@ -1 +1 @@
-From 6bb5ffe3ea9a5ad41848c19c2787df42de2a3cab Mon Sep 17 00:00:00 2001
+From 59b5633558a0ce472d328a69f4dda1c3084d5765 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6bb5ffe3ea9a5ad41848c19c2787df42de2a3cab ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -17 +18 @@
-index fc28e2d702..d57db0589a 100644
+index 74dd72b3ac..44576bed42 100644
@@ -20,2 +21,2 @@
-@@ -629,4 +629,9 @@ static void dpdk_init(void)
- 	}
+@@ -528,4 +528,9 @@ static void dpdk_init(void)
+ 		eal_argv[i] = strdup(args[i]);



More information about the stable mailing list