perf tests: Fix out of bounds access on array fd when cnt is 100

Currently when cnt is 100 an array bounds overflow occurs on the
assignment of fd[cnt]. Fix this by performing the bounds check on cnt
before writing to fd.

Detected by cppcheck:

tools/perf/tests/bp_account.c:115: (warning) Either the condition
'cnt==100' is redundant or the array 'fd[100]' is accessed at index 100,
which is out of bounds.

Signed-off-by: Colin King <colin.king@canonical.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: kernel-janitors@vger.kernel.org
Fixes: 032db28e5f ("perf tests: Add breakpoint accounting/modify test")
Link: http://lkml.kernel.org/r/20180314173354.11250-1-colin.king@canonical.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Colin Ian King 2018-03-14 17:33:54 +00:00 коммит произвёл Arnaldo Carvalho de Melo
Родитель 6810158d52
Коммит 66790bc8e1
1 изменённых файлов: 3 добавлений и 5 удалений

Просмотреть файл

@ -107,16 +107,14 @@ static int detect_cnt(bool is_x)
int fd[100], cnt = 0, i; int fd[100], cnt = 0, i;
while (1) { while (1) {
fd[cnt] = __event(is_x, addr, &attr);
if (fd[cnt] < 0)
break;
if (cnt == 100) { if (cnt == 100) {
pr_debug("way too many debug registers, fix the test\n"); pr_debug("way too many debug registers, fix the test\n");
return 0; return 0;
} }
fd[cnt] = __event(is_x, addr, &attr);
if (fd[cnt] < 0)
break;
cnt++; cnt++;
} }