[dpdk-stable] patch 'bus/pci: replace strncpy by strlcpy' 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 349ac92512cac209eed58c9d457b98401b0c5cc9 Mon Sep 17 00:00:00 2001
From: Andy Green <andy at warmcat.com>
Date: Mon, 14 May 2018 13:00:06 +0800
Subject: [PATCH] bus/pci: replace strncpy by strlcpy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit fe5f777b538301ecadf3fee5c30dd0b289f50c7c ]

In function ‘pci_get_kernel_driver_by_path’,
    inlined from ‘pci_scan_one.isra.1’ at
	drivers/bus/pci/linux/pci.c:317:8:
drivers/bus/pci/linux/pci.c:57:3: error:
‘strncpy’ specified bound depends on the length of the source argument
[-Werror=stringop-overflow=]
   strncpy(dri_name, name + 1, strlen(name + 1) + 1);

Fixes: d9a8cd9595f2 ("pci: add kernel driver type")

Signed-off-by: Andy Green <andy at warmcat.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
Reviewed-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/bus/pci/linux/pci.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index f955ede21..aabaa6300 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -63,7 +63,8 @@
 extern struct rte_pci_bus rte_pci_bus;
 
 static int
-pci_get_kernel_driver_by_path(const char *filename, char *dri_name)
+pci_get_kernel_driver_by_path(const char *filename, char *dri_name,
+			      size_t len)
 {
 	int count;
 	char path[PATH_MAX];
@@ -84,7 +85,7 @@ pci_get_kernel_driver_by_path(const char *filename, char *dri_name)
 
 	name = strrchr(path, '/');
 	if (name) {
-		strncpy(dri_name, name + 1, strlen(name + 1) + 1);
+		strlcpy(dri_name, name + 1, len);
 		return 0;
 	}
 
@@ -340,7 +341,7 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
 
 	/* parse driver */
 	snprintf(filename, sizeof(filename), "%s/driver", dirname);
-	ret = pci_get_kernel_driver_by_path(filename, driver);
+	ret = pci_get_kernel_driver_by_path(filename, driver, sizeof(driver));
 	if (ret < 0) {
 		RTE_LOG(ERR, EAL, "Fail to get kernel driver\n");
 		free(dev);
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-02 23:59:12.598395408 -0800
+++ 0009-bus-pci-replace-strncpy-by-strlcpy.patch	2019-01-02 23:59:12.026816000 -0800
@@ -1,4 +1,4 @@
-From fe5f777b538301ecadf3fee5c30dd0b289f50c7c Mon Sep 17 00:00:00 2001
+From 349ac92512cac209eed58c9d457b98401b0c5cc9 Mon Sep 17 00:00:00 2001
 From: Andy Green <andy at warmcat.com>
 Date: Mon, 14 May 2018 13:00:06 +0800
 Subject: [PATCH] bus/pci: replace strncpy by strlcpy
@@ -6,6 +6,8 @@
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+[ upstream commit fe5f777b538301ecadf3fee5c30dd0b289f50c7c ]
+
 In function ‘pci_get_kernel_driver_by_path’,
     inlined from ‘pci_scan_one.isra.1’ at
 	drivers/bus/pci/linux/pci.c:317:8:
@@ -15,27 +17,46 @@
    strncpy(dri_name, name + 1, strlen(name + 1) + 1);
 
 Fixes: d9a8cd9595f2 ("pci: add kernel driver type")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andy Green <andy at warmcat.com>
 Acked-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
+Reviewed-by: Andrew Rybchenko <arybchenko at solarflare.com>
 ---
- drivers/bus/pci/linux/pci.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ drivers/bus/pci/linux/pci.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
-index 4630a8057..a73ee49c2 100644
+index f955ede21..aabaa6300 100644
 --- a/drivers/bus/pci/linux/pci.c
 +++ b/drivers/bus/pci/linux/pci.c
-@@ -54,7 +54,7 @@ pci_get_kernel_driver_by_path(const char *filename, char *dri_name)
+@@ -63,7 +63,8 @@
+ extern struct rte_pci_bus rte_pci_bus;
+ 
+ static int
+-pci_get_kernel_driver_by_path(const char *filename, char *dri_name)
++pci_get_kernel_driver_by_path(const char *filename, char *dri_name,
++			      size_t len)
+ {
+ 	int count;
+ 	char path[PATH_MAX];
+@@ -84,7 +85,7 @@ pci_get_kernel_driver_by_path(const char *filename, char *dri_name)
  
  	name = strrchr(path, '/');
  	if (name) {
 -		strncpy(dri_name, name + 1, strlen(name + 1) + 1);
-+		strlcpy(dri_name, name + 1, sizeof(dri_name));
++		strlcpy(dri_name, name + 1, len);
  		return 0;
  	}
  
+@@ -340,7 +341,7 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
+ 
+ 	/* parse driver */
+ 	snprintf(filename, sizeof(filename), "%s/driver", dirname);
+-	ret = pci_get_kernel_driver_by_path(filename, driver);
++	ret = pci_get_kernel_driver_by_path(filename, driver, sizeof(driver));
+ 	if (ret < 0) {
+ 		RTE_LOG(ERR, EAL, "Fail to get kernel driver\n");
+ 		free(dev);
 -- 
 2.11.0