[dpdk-stable] patch 'net/sfc: make sure that stats name is nul-terminated' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/04/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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 1e597bca44130414065cc9b7cbbbbb653dbb44c0 Mon Sep 17 00:00:00 2001
From: Andy Green <andy at warmcat.com>
Date: Mon, 14 May 2018 13:00:47 +0800
Subject: [PATCH] net/sfc: make sure that stats name is nul-terminated

[ upstream commit ed5b98483a30c034ab7ba666af2c26161828323d ]

Fixes: 73280c1e4ff2 ("net/sfc: support xstats retrieval by ID")
Fixes: 7b9891769f4b ("net/sfc: support extended statistics")

Signed-off-by: Andy Green <andy at warmcat.com>
Acked-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/sfc_ethdev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 819177a34..005df401d 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -35,6 +35,7 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_errno.h>
+#include <rte_string_fns.h>
 
 #include "efx.h"
 
@@ -661,7 +662,7 @@ sfc_xstats_get_names(struct rte_eth_dev *dev,
 	for (i = 0; i < EFX_MAC_NSTATS; ++i) {
 		if (EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, i)) {
 			if (xstats_names != NULL && nstats < xstats_count)
-				strncpy(xstats_names[nstats].name,
+				strlcpy(xstats_names[nstats].name,
 					efx_mac_stat_name(sa->nic, i),
 					sizeof(xstats_names[0].name));
 			nstats++;
@@ -739,9 +740,8 @@ sfc_xstats_get_names_by_id(struct rte_eth_dev *dev,
 		if ((ids == NULL) || (ids[nb_written] == nb_supported)) {
 			char *name = xstats_names[nb_written++].name;
 
-			strncpy(name, efx_mac_stat_name(sa->nic, i),
+			strlcpy(name, efx_mac_stat_name(sa->nic, i),
 				sizeof(xstats_names[0].name));
-			name[sizeof(xstats_names[0].name) - 1] = '\0';
 		}
 
 		++nb_supported;
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-02 23:59:12.845742223 -0800
+++ 0014-net-sfc-make-sure-that-stats-name-is-nul-terminated.patch	2019-01-02 23:59:12.051815000 -0800
@@ -1,11 +1,12 @@
-From ed5b98483a30c034ab7ba666af2c26161828323d Mon Sep 17 00:00:00 2001
+From 1e597bca44130414065cc9b7cbbbbb653dbb44c0 Mon Sep 17 00:00:00 2001
 From: Andy Green <andy at warmcat.com>
 Date: Mon, 14 May 2018 13:00:47 +0800
 Subject: [PATCH] net/sfc: make sure that stats name is nul-terminated
 
+[ upstream commit ed5b98483a30c034ab7ba666af2c26161828323d ]
+
 Fixes: 73280c1e4ff2 ("net/sfc: support xstats retrieval by ID")
 Fixes: 7b9891769f4b ("net/sfc: support extended statistics")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andy Green <andy at warmcat.com>
 Acked-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -14,10 +15,10 @@
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
-index 578af5489..1b6499f85 100644
+index 819177a34..005df401d 100644
 --- a/drivers/net/sfc/sfc_ethdev.c
 +++ b/drivers/net/sfc/sfc_ethdev.c
-@@ -13,6 +13,7 @@
+@@ -35,6 +35,7 @@
  #include <rte_pci.h>
  #include <rte_bus_pci.h>
  #include <rte_errno.h>
@@ -25,7 +26,7 @@
  
  #include "efx.h"
  
-@@ -648,7 +649,7 @@ sfc_xstats_get_names(struct rte_eth_dev *dev,
+@@ -661,7 +662,7 @@ sfc_xstats_get_names(struct rte_eth_dev *dev,
  	for (i = 0; i < EFX_MAC_NSTATS; ++i) {
  		if (EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, i)) {
  			if (xstats_names != NULL && nstats < xstats_count)
@@ -34,7 +35,7 @@
  					efx_mac_stat_name(sa->nic, i),
  					sizeof(xstats_names[0].name));
  			nstats++;
-@@ -726,9 +727,8 @@ sfc_xstats_get_names_by_id(struct rte_eth_dev *dev,
+@@ -739,9 +740,8 @@ sfc_xstats_get_names_by_id(struct rte_eth_dev *dev,
  		if ((ids == NULL) || (ids[nb_written] == nb_supported)) {
  			char *name = xstats_names[nb_written++].name;