[dpdk-stable] patch 'pci: fix parsing of address without function number' has been queued to LTS release 16.11.9

[Luca Boccassi]

Hi,

FYI, your patch has been queued to LTS release 16.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/21/18. 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.

Luca Boccassi

---
>From dbff7219743df71f5a68bbf53fc63b3baf0c282f Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Mon, 12 Nov 2018 00:58:56 +0100
Subject: [PATCH] pci: fix parsing of address without function number

[ upstream commit 31f19a9beb8d88b67be6e469404081eb834d199c ]

If the last part of the PCI address (function number) is missing,
the parsing was successful, assuming function 0.
The call to strtoul is not returning an error in such a case,
so an explicit check is inserted before.

This bug has always been there in older parsing macros:
	- GET_PCIADDR_FIELD
	- GET_BLACKLIST_FIELD

Fixes: af75078fece3 ("first public release")

Reported-by: Wisam Jaddo <wisamm at mellanox.com>
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
---
 lib/librte_eal/common/include/rte_pci.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h
index 9ce884727..10fa85640 100644
--- a/lib/librte_eal/common/include/rte_pci.h
+++ b/lib/librte_eal/common/include/rte_pci.h
@@ -248,6 +248,8 @@ TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource);
 do {                                                               \
 	unsigned long val;                                      \
 	char *end;                                              \
+	if (*in == '\0')                                        \
+		return -EINVAL;                                 \
 	errno = 0;                                              \
 	val = strtoul((in), &end, 16);                          \
 	if (errno != 0 || end[0] != (dlm) || val > (lim))       \
-- 
2.19.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-19 12:15:18.187674722 +0000
+++ 0003-pci-fix-parsing-of-address-without-function-number.patch	2018-11-19 12:15:18.071611433 +0000
@@ -1,8 +1,10 @@
-From 31f19a9beb8d88b67be6e469404081eb834d199c Mon Sep 17 00:00:00 2001
+From dbff7219743df71f5a68bbf53fc63b3baf0c282f Mon Sep 17 00:00:00 2001
 From: Thomas Monjalon <thomas at monjalon.net>
 Date: Mon, 12 Nov 2018 00:58:56 +0100
 Subject: [PATCH] pci: fix parsing of address without function number
 
+[ upstream commit 31f19a9beb8d88b67be6e469404081eb834d199c ]
+
 If the last part of the PCI address (function number) is missing,
 the parsing was successful, assuming function 0.
 The call to strtoul is not returning an error in such a case,
@@ -13,30 +15,27 @@
 	- GET_BLACKLIST_FIELD
 
 Fixes: af75078fece3 ("first public release")
-Cc: stable at dpdk.org
 
 Reported-by: Wisam Jaddo <wisamm at mellanox.com>
 Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
 Acked-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
 ---
- lib/librte_pci/rte_pci.c | 4 ++++
- 1 file changed, 4 insertions(+)
+ lib/librte_eal/common/include/rte_pci.h | 2 ++
+ 1 file changed, 2 insertions(+)
 
-diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c
-index 530738dbd..f400178bb 100644
---- a/lib/librte_pci/rte_pci.c
-+++ b/lib/librte_pci/rte_pci.c
-@@ -30,6 +30,10 @@ get_u8_pciaddr_field(const char *in, void *_u8, char dlm)
- 	uint8_t *u8 = _u8;
- 	char *end;
- 
-+	/* empty string is an error though strtoul() returns 0 */
-+	if (*in == '\0')
-+		return NULL;
-+
- 	errno = 0;
- 	val = strtoul(in, &end, 16);
- 	if (errno != 0 || end[0] != dlm || val > UINT8_MAX) {
+diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h
+index 9ce884727..10fa85640 100644
+--- a/lib/librte_eal/common/include/rte_pci.h
++++ b/lib/librte_eal/common/include/rte_pci.h
+@@ -248,6 +248,8 @@ TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource);
+ do {                                                               \
+ 	unsigned long val;                                      \
+ 	char *end;                                              \
++	if (*in == '\0')                                        \
++		return -EINVAL;                                 \
+ 	errno = 0;                                              \
+ 	val = strtoul((in), &end, 16);                          \
+ 	if (errno != 0 || end[0] != (dlm) || val > (lim))       \
 -- 
 2.19.1