lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf record: Zero out mmap_array to fix segfault

Browse Source 
Reported-by: Li Zefan <lizf@cn.fujitsu.com>
Tested-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Zhang Yanmin <yanmin_zhang@linux.intel.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <1269557941-15617-6-git-send-email-acme@infradead.org>
Cc: <stable@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Zhang, Yanmin
2010-03-25 19:59:01 -03:00
committed by Ingo Molnar
parent 5aab621b7b
commit 5a10317483
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-record.c
View File

@@ -751,7 +751,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
for (i = 0; i < MAX_NR_CPUS; i++) { for (i = 0; i < MAX_NR_CPUS; i++) {
for (j = 0; j < MAX_COUNTERS; j++) { for (j = 0; j < MAX_COUNTERS; j++) {
fd[i][j] = malloc(sizeof(int)*thread_num); fd[i][j] = malloc(sizeof(int)*thread_num);
mmap_array[i][j] = malloc( mmap_array[i][j] = zalloc(
sizeof(struct mmap_data)*thread_num); sizeof(struct mmap_data)*thread_num);
if (!fd[i][j] || !mmap_array[i][j]) if (!fd[i][j] || !mmap_array[i][j])
return -ENOMEM; return -ENOMEM;

2
tools/perf/builtin-top.c
View File

@@ -1371,7 +1371,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
for (i = 0; i < MAX_NR_CPUS; i++) { for (i = 0; i < MAX_NR_CPUS; i++) {
for (j = 0; j < MAX_COUNTERS; j++) { for (j = 0; j < MAX_COUNTERS; j++) {
fd[i][j] = malloc(sizeof(int)*thread_num); fd[i][j] = malloc(sizeof(int)*thread_num);
mmap_array[i][j] = malloc( mmap_array[i][j] = zalloc(
sizeof(struct mmap_data)*thread_num); sizeof(struct mmap_data)*thread_num);
if (!fd[i][j] || !mmap_array[i][j]) if (!fd[i][j] || !mmap_array[i][j])
return -ENOMEM; return -ENOMEM;