diff options
| author | Gabriel Ravier <gabravier@gmail.com> | 2020-03-12 15:50:21 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-01 13:17:47 +0200 |
| commit | 32d9453c208ce13ec585aa91634b05bb0e67f770 (patch) | |
| tree | d0d0fdba97976296af875605a7abb34dd12e99f5 /tools | |
| parent | 3b63e4b7045b8a2b5a44b05cd25a86ee459b0d0a (diff) | |
| download | linux-stable-32d9453c208ce13ec585aa91634b05bb0e67f770.tar.gz linux-stable-32d9453c208ce13ec585aa91634b05bb0e67f770.tar.bz2 linux-stable-32d9453c208ce13ec585aa91634b05bb0e67f770.zip | |
tools: gpio-hammer: Avoid potential overflow in main
[ Upstream commit d1ee7e1f5c9191afb69ce46cc7752e4257340a31 ]
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@gmail.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpio/gpio-hammer.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tools/gpio/gpio-hammer.c b/tools/gpio/gpio-hammer.c index 0e0060a6eb34..083399d276e4 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) { |