[dpdk-stable] patch 'net/ring: avoid hard-coded length' has been queued to LTS release 18.11.2

Kevin Traynor ktraynor at redhat.com
Wed May 8 18:02:16 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/14/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/94a6faf88772624a286b55cbf1400152d58e0440

Thanks.

Kevin Traynor

---
>From 94a6faf88772624a286b55cbf1400152d58e0440 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Tue, 23 Apr 2019 09:53:33 -0700
Subject: [PATCH] net/ring: avoid hard-coded length

[ upstream commit 1af59f5ddacaf9287f81e20b49207f28ecbb0e56 ]

Don't hard code string length in two place; use sizeof() instead.
Ring name should use RTE_RING_NAMESIZE.

Fixes: 96cb19521147 ("net/ring: use EAL APIs in PMD specific API")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/ring/rte_eth_ring.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index f301ba9f4..8776492b8 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -363,6 +363,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 		.addr = &args,
 	};
-	char args_str[32] = { 0 };
-	char ring_name[32] = { 0 };
+	char args_str[32];
+	char ring_name[RTE_RING_NAMESIZE];
 	uint16_t port_id = RTE_MAX_ETHPORTS;
 	int ret;
@@ -382,6 +382,7 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 	}
 
-	snprintf(args_str, 32, "%s=%p", ETH_RING_INTERNAL_ARG, &args);
-	snprintf(ring_name, 32, "net_ring_%s", name);
+	snprintf(args_str, sizeof(args_str), "%s=%p",
+		 ETH_RING_INTERNAL_ARG, &args);
+	snprintf(ring_name, sizeof(ring_name), "net_ring_%s", name);
 
 	ret = rte_vdev_init(ring_name, args_str);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-08 16:33:58.437720118 +0100
+++ 0019-net-ring-avoid-hard-coded-length.patch	2019-05-08 16:33:57.393578764 +0100
@@ -1 +1 @@
-From 1af59f5ddacaf9287f81e20b49207f28ecbb0e56 Mon Sep 17 00:00:00 2001
+From 94a6faf88772624a286b55cbf1400152d58e0440 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1af59f5ddacaf9287f81e20b49207f28ecbb0e56 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 91e5f5f8f..2e4ca3b16 100644
+index f301ba9f4..8776492b8 100644


More information about the stable mailing list