patch 'app/dumpcap: fix storing port identifier' has been queued to stable release 21.11.4

Kevin Traynor ktraynor at redhat.com
Thu Feb 23 16:05:13 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 02/28/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/f8d7e778b5b5eb065f7ad2d4f21c196ce34c8861

Thanks.

Kevin

---
>From f8d7e778b5b5eb065f7ad2d4f21c196ce34c8861 Mon Sep 17 00:00:00 2001
From: Ben Magistro <koncept1 at gmail.com>
Date: Tue, 3 Jan 2023 19:38:10 -0800
Subject: [PATCH] app/dumpcap: fix storing port identifier

[ upstream commit dbb27d6fd88ed9e8177d9e49347905dbd2bae300 ]

When dumpcap adds an interface, the port was not being preserved. This
results in the structure being initialized and the port field being set
to 0 regardless of what port was actually selected. This unset field is
then used in both the enable and cleanup calls. This could result in the
capture occurring on the wrong interface.

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

Signed-off-by: Ben Magistro <koncept1 at gmail.com>
Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
 app/dumpcap/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c
index 8b30d5f1a8..a828b7c8a4 100644
--- a/app/dumpcap/main.c
+++ b/app/dumpcap/main.c
@@ -197,4 +197,5 @@ static void add_interface(uint16_t port, const char *name)
 
 	memset(intf, 0, sizeof(*intf));
+	intf->port = port;
 	rte_strscpy(intf->name, name, sizeof(intf->name));
 
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:24.377865129 +0000
+++ 0022-app-dumpcap-fix-storing-port-identifier.patch	2023-02-23 14:46:23.729235823 +0000
@@ -1 +1 @@
-From dbb27d6fd88ed9e8177d9e49347905dbd2bae300 Mon Sep 17 00:00:00 2001
+From f8d7e778b5b5eb065f7ad2d4f21c196ce34c8861 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit dbb27d6fd88ed9e8177d9e49347905dbd2bae300 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index d1c70f769b..5ccafd4c3c 100644
+index 8b30d5f1a8..a828b7c8a4 100644
@@ -25 +26 @@
-@@ -209,4 +209,5 @@ static void add_interface(uint16_t port, const char *name)
+@@ -197,4 +197,5 @@ static void add_interface(uint16_t port, const char *name)



More information about the stable mailing list