From: David Marchand <david.marchand@redhat.com>
To: Gaetan Rivet <grive@u256.net>
Cc: dev <dev@dpdk.org>, dpdk stable <stable@dpdk.org>,
Luca Boccassi <bluca@debian.org>,
Kevin Traynor <ktraynor@redhat.com>
Subject: Re: [dpdk-dev] [PATCH v1 1/2] pci: fix allowing underflow when parsing PCI id
Date: Tue, 19 May 2020 11:17:24 +0200 [thread overview]
Message-ID: <CAJFAV8wFJKAsT9jPVC00ZVYpK=NVMpeX9ega_ep4v4Z9i2FP6g@mail.gmail.com> (raw)
In-Reply-To: <20200513104751.46466-2-grive@u256.net>
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
next prev parent reply other threads:[~2020-05-19 9:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-13 10:47 [dpdk-dev] [PATCH v1 0/2] pci: a comment and a minor fix Gaetan Rivet
2020-05-13 10:47 ` [dpdk-dev] [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 [this message]
2020-05-13 10:47 ` [dpdk-dev] [PATCH v1 2/2] pci: explain how empty strings are rejected in DBDF Gaetan Rivet
2020-05-14 8:53 ` Stojaczyk, Dariusz
2020-05-19 9:18 ` David Marchand
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='CAJFAV8wFJKAsT9jPVC00ZVYpK=NVMpeX9ega_ep4v4Z9i2FP6g@mail.gmail.com' \
--to=david.marchand@redhat.com \
--cc=bluca@debian.org \
--cc=dev@dpdk.org \
--cc=grive@u256.net \
--cc=ktraynor@redhat.com \
--cc=stable@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).