[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAMRc=Me=u5dq1_kOk3qJ-XZbkiOrK01ZDueY6K_U2N2QSc27zQ@mail.gmail.com>
Date: Sat, 14 Mar 2020 21:28:29 +0100
From: Bartosz Golaszewski <brgl@...ev.pl>
To: Gabriel Ravier <gabravier@...il.com>
Cc: Linus Walleij <linus.walleij@...aro.org>,
Bartosz Golaszewski <bgolaszewski@...libre.com>,
"open list:GPIO SUBSYSTEM" <linux-gpio@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v3] gpio-hammer: Avoid potential overflow in main
czw., 12 mar 2020 o 15:50 Gabriel Ravier <gabravier@...il.com> napisaĆ(a):
>
> If '-o' was used more than 64 times in a single invocation of gpio-hammer,
> this could lead to an overflow of the 'lines' array. This commit fixes
> this by avoiding the overflow and giving a proper diagnostic back to the
> user
>
> Signed-off-by: Gabriel Ravier <gabravier@...il.com>
> ---
> tools/gpio/gpio-hammer.c | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/tools/gpio/gpio-hammer.c b/tools/gpio/gpio-hammer.c
> index 0e0060a6e..083399d27 100644
> --- a/tools/gpio/gpio-hammer.c
> +++ b/tools/gpio/gpio-hammer.c
> @@ -135,7 +135,14 @@ int main(int argc, char **argv)
> device_name = optarg;
> break;
> case 'o':
> - lines[i] = strtoul(optarg, NULL, 10);
> + /*
> + * Avoid overflow. Do not immediately error, we want to
> + * be able to accurately report on the amount of times
> + * '-o' was given to give an accurate error message
> + */
> + if (i < GPIOHANDLES_MAX)
> + lines[i] = strtoul(optarg, NULL, 10);
> +
> i++;
> break;
> case '?':
> @@ -143,6 +150,14 @@ int main(int argc, char **argv)
> return -1;
> }
> }
> +
> + if (i >= GPIOHANDLES_MAX) {
> + fprintf(stderr,
> + "Only %d occurences of '-o' are allowed, %d were found\n",
> + GPIOHANDLES_MAX, i + 1);
> + return -1;
> + }
> +
> nlines = i;
>
> if (!device_name || !nlines) {
> --
> 2.24.1
>
Patch applied, thanks!
Bartosz
Powered by blists - more mailing lists