From: "Gaëtan Rivet" <gaetan.rivet@6wind.com>
To: Matan Azrad <matan@mellanox.com>
Cc: dev@dpdk.org, Ori Kam <orika@mellanox.com>, stable@dpdk.org
Subject: Re: [dpdk-stable] [PATCH] net/failsafe: fix parameters parsing
Date: Thu, 17 Aug 2017 17:25:46 +0200 [thread overview]
Message-ID: <20170817152546.GP8124@bidouze.vm.6wind.com> (raw)
In-Reply-To: <1502979581-27282-1-git-send-email-matan@mellanox.com>
Hi Matan,
Thanks for spotting the bug.
On Thu, Aug 17, 2017 at 05:19:41PM +0300, Matan Azrad wrote:
> The corrupted code used wrongly snprintf return value as the
> number of characters actually copied, in spite of the meanning
> is the number of characters which would be generated for the
> given input.
>
> It caused to remain zerod bytes between the failsafe command line
> non sub device parameters indicates end of string.
>
> Hence, when rte_kvargs_parse tried to parse all parameters, it
> got end of string after the first one and the others weren't parsed.
>
> So, if the mac parameters was the first in command line it was
> taken while hotplug_poll was left default, and vice versa.
>
> The fix updates the buffer index by dedicated variable contains
> the copy size, by the way uses memcpy instead of snprintf
> which is good enouth for this copy scenario.
Actually snprintf should still be used.
>
> Fixes: a46f8d584eb8 ("net/failsafe: add fail-safe PMD")
> Cc: stable@dpdk.org
>
> Signed-off-by: Matan Azrad <matan@mellanox.com>
> ---
> drivers/net/failsafe/failsafe_args.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/failsafe/failsafe_args.c b/drivers/net/failsafe/failsafe_args.c
> index 1f22416..0a98b04 100644
> --- a/drivers/net/failsafe/failsafe_args.c
> +++ b/drivers/net/failsafe/failsafe_args.c
> @@ -271,7 +271,7 @@ static int
> fs_remove_sub_devices_definition(char params[DEVARGS_MAXLEN])
> {
> char buffer[DEVARGS_MAXLEN] = {0};
> - size_t a, b;
> + size_t a, b, temp;
temp is not descriptive enough.
You are declaring this variable here because you want to re-use it
instead of `start`. This is an overreach however, this fix must be
restricted to the actual bug.
> int i;
>
> a = 0;
> @@ -286,12 +286,14 @@ fs_remove_sub_devices_definition(char params[DEVARGS_MAXLEN])
> ERROR("Invalid parameter");
> return -EINVAL;
> }
> - if (params[b] == ',' || params[b] == '\0')
Declare the temporary variable in this scope, with a descriptive name
such as "len", "length", "param_len" or something close.
> - i += snprintf(&buffer[i], b - a + 1, "%s", ¶ms[a]);
> - if (params[b] == '(') {
> - size_t start = b;
> + if (params[b] == ',' || params[b] == '\0') {
> + temp = b - a + 1;
The value here should be "b - a".
If a != 0 however, then we are parsing a new parameter and buffer
already contains at least one. A comma should be added to separate the
two.
An example might clarify what I mean:
if (params[b] == ',' || params[b] == '\0') {
size_t param_len = b - a;
if (a)
param_len += 1;
snprintf(&buffer[i], param_len + 1, "%s%s",
a ? "," : "", ¶ms[a]);
i += param_len;
}
The conditionals about `a` are ugly however, if you find a better way to write
those you are most welcome :).
> + memcpy(&buffer[i], ¶ms[a], temp);
> + i += temp;
> + } else if (params[b] == '(') {
> + temp = b;
> b += closing_paren(¶ms[b]);
> - if (b == start)
The changes should be limited to the actual bug. No need to change this.
> + if (b == temp)
> return -EINVAL;
> b += 1;
> if (params[b] == '\0')
> --
> 2.7.4
>
Thanks again for the debug and sorry for being nitpicky.
--
Gaëtan Rivet
6WIND
next prev parent reply other threads:[~2017-08-17 15:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-17 14:19 Matan Azrad
2017-08-17 15:25 ` Gaëtan Rivet [this message]
2017-08-17 15:54 ` Matan Azrad
2017-08-17 16:24 ` Gaëtan Rivet
2017-08-17 18:52 ` Matan Azrad
2017-08-18 9:03 ` Gaëtan Rivet
2017-08-19 21:24 ` Matan Azrad
2017-08-19 22:07 ` [dpdk-stable] [PATCH v2] " Matan Azrad
2017-08-21 9:34 ` Gaëtan Rivet
2017-08-21 12:02 ` Matan Azrad
2017-08-21 13:25 ` Gaëtan Rivet
2017-08-27 7:23 ` [dpdk-stable] [PATCH v3] " Matan Azrad
2017-08-28 7:52 ` Gaëtan Rivet
2017-08-29 17:05 ` 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=20170817152546.GP8124@bidouze.vm.6wind.com \
--to=gaetan.rivet@6wind.com \
--cc=dev@dpdk.org \
--cc=matan@mellanox.com \
--cc=orika@mellanox.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).