2017-12-08 17:12:30

by Luiz Augusto von Dentz

Subject: [PATCH v2] mesh: Fix crash while reading input parameters

From: Luiz Augusto von Dentz <[email protected]>

read_input_parameters skips the command argument thus arg[0] shall be
considerer the fist argument.
---
mesh/config-client.c | 5 ++++-
mesh/onoff-model.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mesh/config-client.c b/mesh/config-client.c
index 7aabe6ce7..3d618b6a6 100644
--- a/mesh/config-client.c
+++ b/mesh/config-client.c
@@ -229,10 +229,13 @@ static uint32_t read_input_parameters(int argc, char *argv[])
{
uint32_t i;

+ if (!argc)
+ return 0;
+
--argc;
++argv;

- if (!argc || argv[1][0] == '\0')
+ if (!argc || argv[0][0] == '\0')
return 0;

memset(parms, 0xff, sizeof(parms));
diff --git a/mesh/onoff-model.c b/mesh/onoff-model.c
index 9c8869414..fc0d64617 100644
--- a/mesh/onoff-model.c
+++ b/mesh/onoff-model.c
@@ -152,10 +152,13 @@ static uint32_t read_input_parameters(int argc, char *argv[])
{
uint32_t i;

+ if (!argc)
+ return 0;
+
--argc;
++argv;

- if (!argc || argv[1][0] == '\0')
+ if (!argc || argv[0][0] == '\0')
return 0;

memset(parms, 0xff, sizeof(parms));
--
2.13.6

2017-12-11 09:20:28

by Johan Hedberg

Subject: Re: [PATCH v2] mesh: Fix crash while reading input parameters

Hi Luiz,

On Fri, Dec 08, 2017, Luiz Augusto von Dentz wrote:
> read_input_parameters skips the command argument thus arg[0] shall be
> considerer the fist argument.
> ---
> mesh/config-client.c | 5 ++++-
> mesh/onoff-model.c | 5 ++++-
> 2 files changed, 8 insertions(+), 2 deletions(-)

Applied. Thanks.

Johan

2017-12-10 10:58:39

by Steve Brown

Subject: Re: [PATCH v2] mesh: Fix crash while reading input parameters

Hi Luiz,

On Fri, 2017-12-08 at 15:12 -0200, Luiz Augusto von Dentz wrote:
> From: Luiz Augusto von Dentz <[email protected]>
>
> read_input_parameters skips the command argument thus arg[0] shall be
> considerer the fist argument.
> ---
> mesh/config-client.c | 5 ++++-
> mesh/onoff-model.c | 5 ++++-
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/mesh/config-client.c b/mesh/config-client.c
> index 7aabe6ce7..3d618b6a6 100644
> --- a/mesh/config-client.c
> +++ b/mesh/config-client.c
> @@ -229,10 +229,13 @@ static uint32_t read_input_parameters(int argc,
> char *argv[])
> {
> uint32_t i;
>
> + if (!argc)
> + return 0;
> +
> --argc;
> ++argv;
>
> - if (!argc || argv[1][0] == '\0')
> + if (!argc || argv[0][0] == '\0')
> return 0;
>
> memset(parms, 0xff, sizeof(parms));
> diff --git a/mesh/onoff-model.c b/mesh/onoff-model.c
> index 9c8869414..fc0d64617 100644
> --- a/mesh/onoff-model.c
> +++ b/mesh/onoff-model.c
> @@ -152,10 +152,13 @@ static uint32_t read_input_parameters(int argc,
> char *argv[])
> {
> uint32_t i;
>
> + if (!argc)
> + return 0;
> +
> --argc;
> ++argv;
>
> - if (!argc || argv[1][0] == '\0')
> + if (!argc || argv[0][0] == '\0')
> return 0;
>
> memset(parms, 0xff, sizeof(parms));

I tested both config and onoff.

Both fixed.

Thanks,

Steve