From: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
To: linux-kernel@vger•kernel.org
Cc: Song Liu <songliubraving@fb•com>,
Konstantin Khlebnikov <khlebnikov@yandex-team•ru>,
Rasmus Villemoes <linux@rasmusvillemoes•dk>,
Jin Yao <yao.jin@linux•intel.com>,
Sasha Levin <sashal@kernel•org>, Andi Kleen <ak@linux•intel.com>,
Alexey Budankov <alexey.budankov@linux•intel.com>,
Alexander Shishkin <alexander.shishkin@linux•intel.com>,
Suzuki Poulouse <suzuki.poulose@arm•com>,
Arnaldo Carvalho de Melo <acme@redhat•com>,
Alexios Zavras <alexios.zavras@intel•com>,
Davidlohr Bueso <dave@stgolabs•net>,
Namhyung Kim <namhyung@kernel•org>,
Thomas Gleixner <tglx@linutronix•de>,
linux-arm-kernel@lists•infradead.org,
Mathieu Poirier <mathieu.poirier@linaro•org>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Thomas Richter <tmricht@linux•ibm.com>,
Adrian Hunter <adrian.hunter@intel•com>,
stable@vger•kernel.org, "David S. Miller" <davem@davemloft•net>,
Changbin Du <changbin.du@intel•com>,
Peter Zijlstra <peterz@infradead•org>,
Jiri Olsa <jolsa@kernel•org>, Leo Yan <leo.yan@linaro•org>,
Eric Saint-Etienne <eric.saint.etienne@oracle•com>
Subject: [PATCH 5.2 122/215] perf top: Fix potential NULL pointer dereference detected by the smatch tool
Date: Mon, 29 Jul 2019 21:21:58 +0200 [thread overview]
Message-ID: <20190729190800.312232580@linuxfoundation.org> (raw)
In-Reply-To: <20190729190739.971253303@linuxfoundation.org>
[ Upstream commit 111442cfc8abdeaa7ec1407f07ef7b3e5f76654e ]
Based on the following report from Smatch, fix the potential NULL
pointer dereference check.
tools/perf/builtin-top.c:109
perf_top__parse_source() warn: variable dereferenced before check 'he'
(see line 103)
tools/perf/builtin-top.c:233
perf_top__show_details() warn: variable dereferenced before check 'he'
(see line 228)
tools/perf/builtin-top.c
101 static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he)
102 {
103 struct perf_evsel *evsel = hists_to_evsel(he->hists);
^^^^
104 struct symbol *sym;
105 struct annotation *notes;
106 struct map *map;
107 int err = -1;
108
109 if (!he || !he->ms.sym)
110 return -1;
This patch moves the values assignment after validating pointer 'he'.
Signed-off-by: Leo Yan <leo.yan@linaro•org>
Acked-by: Jiri Olsa <jolsa@kernel•org>
Cc: Adrian Hunter <adrian.hunter@intel•com>
Cc: Alexander Shishkin <alexander.shishkin@linux•intel.com>
Cc: Alexey Budankov <alexey.budankov@linux•intel.com>
Cc: Alexios Zavras <alexios.zavras@intel•com>
Cc: Andi Kleen <ak@linux•intel.com>
Cc: Changbin Du <changbin.du@intel•com>
Cc: David S. Miller <davem@davemloft•net>
Cc: Davidlohr Bueso <dave@stgolabs•net>
Cc: Eric Saint-Etienne <eric.saint.etienne@oracle•com>
Cc: Jin Yao <yao.jin@linux•intel.com>
Cc: Konstantin Khlebnikov <khlebnikov@yandex-team•ru>
Cc: Mathieu Poirier <mathieu.poirier@linaro•org>
Cc: Namhyung Kim <namhyung@kernel•org>
Cc: Peter Zijlstra <peterz@infradead•org>
Cc: Rasmus Villemoes <linux@rasmusvillemoes•dk>
Cc: Song Liu <songliubraving@fb•com>
Cc: Suzuki Poulouse <suzuki.poulose@arm•com>
Cc: Thomas Gleixner <tglx@linutronix•de>
Cc: Thomas Richter <tmricht@linux•ibm.com>
Cc: linux-arm-kernel@lists•infradead.org
Link: http://lkml.kernel.org/r/20190702103420.27540-4-leo.yan@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat•com>
Signed-off-by: Sasha Levin <sashal@kernel•org>
---
tools/perf/builtin-top.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 466621cd1017..8a9ff4b11df0 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -100,7 +100,7 @@ static void perf_top__resize(struct perf_top *top)
static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he)
{
- struct perf_evsel *evsel = hists_to_evsel(he->hists);
+ struct perf_evsel *evsel;
struct symbol *sym;
struct annotation *notes;
struct map *map;
@@ -109,6 +109,8 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he)
if (!he || !he->ms.sym)
return -1;
+ evsel = hists_to_evsel(he->hists);
+
sym = he->ms.sym;
map = he->ms.map;
@@ -225,7 +227,7 @@ static void perf_top__record_precise_ip(struct perf_top *top,
static void perf_top__show_details(struct perf_top *top)
{
struct hist_entry *he = top->sym_filter_entry;
- struct perf_evsel *evsel = hists_to_evsel(he->hists);
+ struct perf_evsel *evsel;
struct annotation *notes;
struct symbol *symbol;
int more;
@@ -233,6 +235,8 @@ static void perf_top__show_details(struct perf_top *top)
if (!he)
return;
+ evsel = hists_to_evsel(he->hists);
+
symbol = he->ms.sym;
notes = symbol__annotation(symbol);
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-07-29 19:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190729190739.971253303@linuxfoundation.org>
2019-07-29 19:21 ` [PATCH 5.2 120/215] perf stat: Fix use-after-freed pointer detected by the smatch tool Greg Kroah-Hartman
2019-07-29 19:21 ` Greg Kroah-Hartman [this message]
2019-07-29 19:21 ` [PATCH 5.2 123/215] perf trace: Fix potential NULL pointer dereference found " Greg Kroah-Hartman
2019-07-29 19:22 ` [PATCH 5.2 124/215] perf session: " Greg Kroah-Hartman
2019-07-29 19:22 ` [PATCH 5.2 125/215] perf map: Fix potential NULL pointer dereference found by " Greg Kroah-Hartman
2019-07-29 19:22 ` [PATCH 5.2 126/215] perf annotate: Fix dereferencing freed memory found by the " Greg Kroah-Hartman
2019-07-29 19:22 ` [PATCH 5.2 127/215] perf hists browser: Fix potential NULL pointer dereference " Greg Kroah-Hartman
2019-07-29 19:22 ` [PATCH 5.2 130/215] perf intel-bts: " Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190729190800.312232580@linuxfoundation.org \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=acme@redhat$(echo .)com \
--cc=adrian.hunter@intel$(echo .)com \
--cc=ak@linux$(echo .)intel.com \
--cc=alexander.shishkin@linux$(echo .)intel.com \
--cc=alexey.budankov@linux$(echo .)intel.com \
--cc=alexios.zavras@intel$(echo .)com \
--cc=changbin.du@intel$(echo .)com \
--cc=dave@stgolabs$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=eric.saint.etienne@oracle$(echo .)com \
--cc=jolsa@kernel$(echo .)org \
--cc=khlebnikov@yandex-team$(echo .)ru \
--cc=leo.yan@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux@rasmusvillemoes$(echo .)dk \
--cc=mathieu.poirier@linaro$(echo .)org \
--cc=namhyung@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=sashal@kernel$(echo .)org \
--cc=songliubraving@fb$(echo .)com \
--cc=stable@vger$(echo .)kernel.org \
--cc=suzuki.poulose@arm$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=tmricht@linux$(echo .)ibm.com \
--cc=yao.jin@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox