[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-5rfzbalwjphmdzzil74eazyl@git.kernel.org>
Date: Sat, 5 Jul 2014 03:42:27 -0700
From: tip-bot for Jiri Olsa <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, paulus@...ba.org, hpa@...or.com,
mingo@...nel.org, jolsa@...nel.org, a.p.zijlstra@...llo.nl,
acme@...nel.org, namhyung@...nel.org, fweisbec@...il.com,
dsahern@...il.com, tglx@...utronix.de, cjashfor@...ux.vnet.ibm.com
Subject: [tip:perf/core] perf tools:
Fix wrong condition for allocation failure
Commit-ID: d180ac14a95d738c2d2622db82c2212a8f998200
Gitweb: http://git.kernel.org/tip/d180ac14a95d738c2d2622db82c2212a8f998200
Author: Jiri Olsa <jolsa@...nel.org>
AuthorDate: Fri, 20 Jun 2014 10:56:34 +0200
Committer: Jiri Olsa <jolsa@...nel.org>
CommitDate: Fri, 27 Jun 2014 11:14:54 +0200
perf tools: Fix wrong condition for allocation failure
Check real allocated pointer for NULL.
Cc: Arnaldo Carvalho de Melo <acme@...nel.org>
Cc: Corey Ashford <cjashfor@...ux.vnet.ibm.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: Ingo Molnar <mingo@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Link: http://lkml.kernel.org/n/tip-5rfzbalwjphmdzzil74eazyl@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@...nel.org>
---
tools/perf/builtin-stat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 65a151e..3e80aa1 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -184,7 +184,7 @@ static void perf_evsel__reset_stat_priv(struct perf_evsel *evsel)
static int perf_evsel__alloc_stat_priv(struct perf_evsel *evsel)
{
evsel->priv = zalloc(sizeof(struct perf_stat));
- if (evsel == NULL)
+ if (evsel->priv == NULL)
return -ENOMEM;
perf_evsel__reset_stat_priv(evsel);
return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists