[tip:perf/core] perf record: Zero out mmap_array to fix segfault
in [Kernel]
|
Prev: [PATCHv3 0/2] tracing: function graph output for preempt/irqs-off tracers
Next: Broken mmotm.git at zen-kernel.org
From: tip-bot for Zhang, Yanmin on 26 Mar 2010 09:00 Commit-ID: 5a10317483f606106395814ee2fdaa2f1256a3b3 Gitweb: http://git.kernel.org/tip/5a10317483f606106395814ee2fdaa2f1256a3b3 Author: Zhang, Yanmin <yanmin_zhang(a)linux.intel.com> AuthorDate: Thu, 25 Mar 2010 19:59:01 -0300 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Fri, 26 Mar 2010 08:52:59 +0100 perf record: Zero out mmap_array to fix segfault Reported-by: Li Zefan <lizf(a)cn.fujitsu.com> Tested-by: Li Zefan <lizf(a)cn.fujitsu.com> Signed-off-by: Zhang Yanmin <yanmin_zhang(a)linux.intel.com> Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> LKML-Reference: <1269557941-15617-6-git-send-email-acme(a)infradead.org> Cc: <stable(a)kernel.org> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-top.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index bb5b23d..60ecdd3 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -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 (j = 0; j < MAX_COUNTERS; j++) { fd[i][j] = malloc(sizeof(int)*thread_num); - mmap_array[i][j] = malloc( + mmap_array[i][j] = zalloc( sizeof(struct mmap_data)*thread_num); if (!fd[i][j] || !mmap_array[i][j]) return -ENOMEM; diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 5f3ac9f..4abdd9b 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -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 (j = 0; j < MAX_COUNTERS; j++) { fd[i][j] = malloc(sizeof(int)*thread_num); - mmap_array[i][j] = malloc( + mmap_array[i][j] = zalloc( sizeof(struct mmap_data)*thread_num); if (!fd[i][j] || !mmap_array[i][j]) return -ENOMEM; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |