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

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/19. So please
shout if anyone has objection.

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.

Thanks.

Yongseok

---
>From afd46f4e50472b3ea1ed3c0f92786bf2324912b9 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 77976ce777..6617e0d778 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -379,8 +379,8 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 		.numa_node = numa_node,
 		.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;
 
@@ -398,8 +398,9 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 		return -1;
 	}
 
-	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);
 	if (ret) {
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:11.599066393 -0700
+++ 0095-net-ring-avoid-hard-coded-length.patch	2019-07-22 17:55:06.460479000 -0700
@@ -1,13 +1,14 @@
-From 1af59f5ddacaf9287f81e20b49207f28ecbb0e56 Mon Sep 17 00:00:00 2001
+From afd46f4e50472b3ea1ed3c0f92786bf2324912b9 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")
-Cc: stable at dpdk.org
 
 Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
@@ -16,10 +17,10 @@
  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 91e5f5f8f2..2e4ca3b16a 100644
+index 77976ce777..6617e0d778 100644
 --- a/drivers/net/ring/rte_eth_ring.c
 +++ b/drivers/net/ring/rte_eth_ring.c
-@@ -362,8 +362,8 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
+@@ -379,8 +379,8 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
  		.numa_node = numa_node,
  		.addr = &args,
  	};
@@ -30,7 +31,7 @@
  	uint16_t port_id = RTE_MAX_ETHPORTS;
  	int ret;
  
-@@ -381,8 +381,9 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
+@@ -398,8 +398,9 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
  		return -1;
  	}