All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Green <andy@warmcat.com>
To: dev@dpdk.org
Subject: [PATCH v6 11/16] net/sfc: make sure that copied stats name is NUL-terminated
Date: Mon, 14 May 2018 13:00:47 +0800	[thread overview]
Message-ID: <152627404723.52758.7608101293442091654.stgit@localhost.localdomain> (raw)
In-Reply-To: <152627394448.52758.15834703911138407294.stgit@localhost.localdomain>

Signed-off-by: Andy Green <andy@warmcat.com>
Acked-by: Andrew Rybchenko <arybchenko@oktetlabs.ru>
Fixes: 73280c1e4ff2 ("net/sfc: support xstats retrieval by ID")
Fixes: 7b9891769f4b ("net/sfc: support extended statistics")
Cc: stable@dpdk.org
---
 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 e42d55350..a8c0f8e19 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -13,6 +13,7 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_errno.h>
+#include <rte_string_fns.h>
 
 #include "efx.h"
 
@@ -663,7 +664,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++;
@@ -741,9 +742,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;

  parent reply	other threads:[~2018-05-14  5:00 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-12  1:47 [PATCH v5 00/16] Fix default build on gcc8.0.1 Andy Green
2018-05-12  1:47 ` [PATCH v5 01/16] devtools/check-git: provide more generic grep pattern Andy Green
2018-05-12  1:47 ` [PATCH v5 02/16] net/nfp: solve buffer overflow Andy Green
2018-05-12  1:47 ` [PATCH v5 03/16] bus/pci: replace strncpy dangerous code Andy Green
2018-05-15  6:12   ` Yao, Lei A
2018-05-15  7:31     ` [PATCH] bus/pci: correct the earlier strlcpy conversion Andy Green
2018-05-15 10:51       ` Andrew Rybchenko
2018-05-15 13:19         ` Thomas Monjalon
2018-05-15  7:32     ` [PATCH v5 03/16] bus/pci: replace strncpy dangerous code Andy Green
2018-05-15  8:18       ` Yao, Lei A
2018-05-12  1:48 ` [PATCH v5 04/16] bus/dpaa: solve inconsistent struct alignment Andy Green
2018-05-12  1:48 ` [PATCH v5 05/16] net/axgbe: solve broken eeprom string comp Andy Green
2018-05-12  1:48 ` [PATCH v5 06/16] net/nfp/nfpcore: solve strncpy misuse Andy Green
2018-05-12  1:48 ` [PATCH v5 07/16] net/nfp/nfpcore: off-by-one and no NUL on strncpy use Andy Green
2018-05-12  1:48 ` [PATCH v5 08/16] net/nfp: don't memcpy out of source range Andy Green
2018-05-12  1:48 ` [PATCH v5 09/16] net/qede: strncpy length constant and NUL Andy Green
2018-05-12  1:48 ` [PATCH v5 10/16] net/qede: solve broken strncpy Andy Green
2018-05-12  1:48 ` [PATCH v5 11/16] net/sfc: make sure that copied stats name is NUL-terminated Andy Green
2018-05-12  1:48 ` [PATCH v5 12/16] net/vdev_netvsc: readlink inputs cannot be aliased Andy Green
2018-05-13  7:20   ` Matan Azrad
2018-05-14  4:54     ` Andy Green
2018-05-12  1:48 ` [PATCH v5 13/16] net/vdev_netvsc: 3 x strncpy misuse Andy Green
2018-05-13  7:47   ` Matan Azrad
2018-05-12  1:48 ` [PATCH v5 14/16] app/proc-info: sprintf overrun bug Andy Green
2018-05-12  1:48 ` [PATCH v5 15/16] app/test-bbdev: strcpy ok for allocated string Andy Green
2018-05-12  1:49 ` [PATCH v5 16/16] " Andy Green
2018-05-14  4:59 ` [PATCH v6 00/16] Fix default build on gcc8.0.1 Andy Green
2018-05-14  4:59   ` [PATCH v6 01/16] devtools/check-git: provide more generic grep pattern Andy Green
2018-05-14 16:28     ` Ferruh Yigit
2018-05-14  5:00   ` [PATCH v6 02/16] net/nfp: solve buffer overflow Andy Green
2018-05-14  5:00   ` [PATCH v6 03/16] bus/pci: replace strncpy dangerous code Andy Green
2018-05-14  5:00   ` [PATCH v6 04/16] bus/dpaa: solve inconsistent struct alignment Andy Green
2018-05-14  5:00   ` [PATCH v6 05/16] net/axgbe: solve broken eeprom string comp Andy Green
2018-05-14  5:00   ` [PATCH v6 06/16] net/nfp/nfpcore: solve strncpy misuse Andy Green
2018-05-14  5:00   ` [PATCH v6 07/16] net/nfp/nfpcore: off-by-one and no NUL on strncpy use Andy Green
2018-05-14  5:00   ` [PATCH v6 08/16] net/nfp: don't memcpy out of source range Andy Green
2018-05-14  5:00   ` [PATCH v6 09/16] net/qede: strncpy length constant and NUL Andy Green
2018-05-14 20:16     ` Ferruh Yigit
2018-05-14  5:00   ` [PATCH v6 10/16] net/qede: solve broken strncpy Andy Green
2018-05-14 20:20     ` Ferruh Yigit
2018-05-14 21:14       ` Ferruh Yigit
2018-05-14 23:04         ` Andy Green
2018-05-14  5:00   ` Andy Green [this message]
2018-05-14  5:00   ` [PATCH v6 12/16] net/vdev_netvsc: readlink inputs cannot be aliased Andy Green
2018-05-14  5:00   ` [PATCH v6 13/16] net/vdev_netvsc: convert snprintf to strlcpy Andy Green
2018-05-14  5:01   ` [PATCH v6 14/16] app/proc-info: sprintf overrun bug Andy Green
2018-05-14 20:31     ` Ferruh Yigit
2018-05-14  5:01   ` [PATCH v6 15/16] app/test-bbdev: strcpy ok for allocated string Andy Green
2018-05-14 20:42     ` Ferruh Yigit
2018-05-14 20:56       ` Ferruh Yigit
2018-05-14 21:01         ` Ferruh Yigit
2018-05-14  5:01   ` [PATCH v6 16/16] " Andy Green
2018-05-14 21:03     ` Ferruh Yigit
2018-05-14 21:29   ` [PATCH v6 00/16] Fix default build on gcc8.0.1 Ferruh Yigit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=152627404723.52758.7608101293442091654.stgit@localhost.localdomain \
    --to=andy@warmcat.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.