From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 825161B130 for ; Thu, 3 Jan 2019 09:14:47 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 3 Jan 2019 10:14:45 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x038EJfh008603; Thu, 3 Jan 2019 10:14:44 +0200 From: Yongseok Koh To: Andy Green Cc: Andrew Rybchenko , dpdk stable Date: Thu, 3 Jan 2019 00:13:37 -0800 Message-Id: <20190103081400.14191-14-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190103081400.14191-1-yskoh@mellanox.com> References: <20190103081400.14191-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/sfc: make sure that stats name is nul-terminated' has been queued to LTS release 17.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jan 2019 08:14:48 -0000 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 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 Acked-by: Andrew Rybchenko --- 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 #include #include +#include #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 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@dpdk.org Signed-off-by: Andy Green Acked-by: Andrew Rybchenko @@ -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 #include #include @@ -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;