Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tools: gpio-hammer: Avoid potential overflow in main

Browse source 
[ 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>
This commit is contained in:
Gabriel Ravier 2020-03-12 15:50:21 +01:00 committed by Greg Kroah-Hartman
parent 68aaf03936
commit 1d0e482939
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/gpio/gpio-hammer.c
View file

@ -138,7 +138,14 @@ int main(int argc, char **argv)
device_name = optarg; device_name = optarg;
break; break;
case 'o': case 'o':
/*
* 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); lines[i] = strtoul(optarg, NULL, 10);
i++; i++;
break; break;
case '?': case '?':
@ -146,6 +153,14 @@ int main(int argc, char **argv)
return -1; 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; nlines = i;
if (!device_name || !nlines) { if (!device_name || !nlines) {