patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH v1 1/2] pci: fix allowing underflow when parsing PCI id
       [not found] <20200513104751.46466-1-grive@u256.net>
@ 2020-05-13 10:47 ` Gaetan Rivet
  2020-05-14  8:52   ` [dpdk-stable] [dpdk-dev] " Stojaczyk, Dariusz
  2020-05-19  9:17   ` David Marchand
  0 siblings, 2 replies; 3+ messages in thread
From: Gaetan Rivet @ 2020-05-13 10:47 UTC (permalink / raw)
  To: dev; +Cc: stable

The function strtoul will not return ERANGE if the input is negative, as
one might expect.

   0000:-FFFFFFFFFFFFFFFB:00.0

is not a better way to write 0000:05:00.0.
To simplify checking for '-', forbid using spaces before the field value.

   0000: 00:   2c.0

Should not be accepted.

Fixes: af75078fece3 ("first public release")
Cc: stable@dpdk.org
Signed-off-by: Gaetan Rivet <grive@u256.net>
---
 lib/librte_pci/rte_pci.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c
index d1ab6b414..e4ecdc32f 100644
--- a/lib/librte_pci/rte_pci.c
+++ b/lib/librte_pci/rte_pci.c
@@ -35,6 +35,12 @@ get_u8_pciaddr_field(const char *in, void *_u8, char dlm)
 	if (*in == '\0')
 		return NULL;
 
+	/* PCI field starting with spaces is forbidden.
+	 * Negative wrap-around is not reported as an error by strtoul.
+	 */
+	if (*in == ' ' || *in == '-')
+		return NULL;
+
 	errno = 0;
 	val = strtoul(in, &end, 16);
 	if (errno != 0 || end[0] != dlm || val > UINT8_MAX) {
@@ -70,6 +76,12 @@ pci_dbdf_parse(const char *input, struct rte_pci_addr *dev_addr)
 	unsigned long val;
 	char *end;
 
+	/* PCI id starting with spaces is forbidden.
+	 * Negative wrap-around is not reported as an error by strtoul.
+	 */
+	if (*in == ' ' || *in == '-')
+		return EINVAL;
+
 	errno = 0;
 	val = strtoul(in, &end, 16);
 	if (errno != 0 || end[0] != ':' || val > UINT16_MAX)
-- 
2.26.2


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH v1 1/2] pci: fix allowing underflow when parsing PCI id
  2020-05-13 10:47 ` [dpdk-stable] [PATCH v1 1/2] pci: fix allowing underflow when parsing PCI id Gaetan Rivet
@ 2020-05-14  8:52   ` Stojaczyk, Dariusz
  2020-05-19  9:17   ` David Marchand
  1 sibling, 0 replies; 3+ messages in thread
From: Stojaczyk, Dariusz @ 2020-05-14  8:52 UTC (permalink / raw)
  To: Gaetan Rivet, dev; +Cc: stable

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Gaetan Rivet
> Sent: Wednesday, May 13, 2020 12:48 PM
> To: dev@dpdk.org
> Cc: stable@dpdk.org
> Subject: [dpdk-dev] [PATCH v1 1/2] pci: fix allowing underflow when parsing PCI
> id
> 
> The function strtoul will not return ERANGE if the input is negative, as
> one might expect.
> 
>    0000:-FFFFFFFFFFFFFFFB:00.0
> 
> is not a better way to write 0000:05:00.0.
> To simplify checking for '-', forbid using spaces before the field value.
> 
>    0000: 00:   2c.0
> 
> Should not be accepted.
> 
> Fixes: af75078fece3 ("first public release")
> Cc: stable@dpdk.org
> Signed-off-by: Gaetan Rivet <grive@u256.net>
> ---

Acked-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH v1 1/2] pci: fix allowing underflow when parsing PCI id
  2020-05-13 10:47 ` [dpdk-stable] [PATCH v1 1/2] pci: fix allowing underflow when parsing PCI id Gaetan Rivet
  2020-05-14  8:52   ` [dpdk-stable] [dpdk-dev] " Stojaczyk, Dariusz
@ 2020-05-19  9:17   ` David Marchand
  1 sibling, 0 replies; 3+ messages in thread
From: David Marchand @ 2020-05-19  9:17 UTC (permalink / raw)
  To: Gaetan Rivet; +Cc: dev, dpdk stable, Luca Boccassi, Kevin Traynor

On Wed, May 13, 2020 at 12:48 PM Gaetan Rivet <grive@u256.net> wrote:
>
> The function strtoul will not return ERANGE if the input is negative, as
> one might expect.
>
>    0000:-FFFFFFFFFFFFFFFB:00.0
>
> is not a better way to write 0000:05:00.0.
> To simplify checking for '-', forbid using spaces before the field value.
>
>    0000: 00:   2c.0
>
> Should not be accepted.
>
> Fixes: af75078fece3 ("first public release")
> Cc: stable@dpdk.org

Not sure about backporting this one, will let stable maintainers
reconsider this.


> Signed-off-by: Gaetan Rivet <grive@u256.net>
Acked-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>

> ---
>  lib/librte_pci/rte_pci.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>
> diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c
> index d1ab6b414..e4ecdc32f 100644
> --- a/lib/librte_pci/rte_pci.c
> +++ b/lib/librte_pci/rte_pci.c
> @@ -35,6 +35,12 @@ get_u8_pciaddr_field(const char *in, void *_u8, char dlm)
>         if (*in == '\0')
>                 return NULL;
>
> +       /* PCI field starting with spaces is forbidden.
> +        * Negative wrap-around is not reported as an error by strtoul.
> +        */
> +       if (*in == ' ' || *in == '-')
> +               return NULL;
> +
>         errno = 0;
>         val = strtoul(in, &end, 16);
>         if (errno != 0 || end[0] != dlm || val > UINT8_MAX) {
> @@ -70,6 +76,12 @@ pci_dbdf_parse(const char *input, struct rte_pci_addr *dev_addr)
>         unsigned long val;
>         char *end;
>
> +       /* PCI id starting with spaces is forbidden.
> +        * Negative wrap-around is not reported as an error by strtoul.
> +        */
> +       if (*in == ' ' || *in == '-')
> +               return EINVAL;

Should be -EINVAL, fixed.

> +
>         errno = 0;
>         val = strtoul(in, &end, 16);
>         if (errno != 0 || end[0] != ':' || val > UINT16_MAX)
> --
> 2.26.2
>

Applied, thanks.


-- 
David Marchand


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-05-19  9:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20200513104751.46466-1-grive@u256.net>
2020-05-13 10:47 ` [dpdk-stable] [PATCH v1 1/2] pci: fix allowing underflow when parsing PCI id Gaetan Rivet
2020-05-14  8:52   ` [dpdk-stable] [dpdk-dev] " Stojaczyk, Dariusz
2020-05-19  9:17   ` David Marchand

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git