From: Sasha Levin <sashal@kernel•org>
To: linux-kernel@vger•kernel.org, stable@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>,
Thomas Richter <tmricht@linux•ibm.com>,
Adrian Hunter <adrian.hunter@intel•com>,
"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 AUTOSEL 5.2 126/171] perf trace: Fix potential NULL pointer dereference found by the smatch tool
Date: Thu, 18 Jul 2019 23:55:57 -0400 [thread overview]
Message-ID: <20190719035643.14300-126-sashal@kernel.org> (raw)
In-Reply-To: <20190719035643.14300-1-sashal@kernel.org>
From: Leo Yan <leo.yan@linaro•org>
[ Upstream commit 7a6d49dc8cad8fa1f3d63994102af8f9ae9c859f ]
Based on the following report from Smatch, fix the potential NULL
pointer dereference check.
tools/perf/builtin-trace.c:1044
thread_trace__new() error: we previously assumed 'ttrace' could be
null (see line 1041).
tools/perf/builtin-trace.c
1037 static struct thread_trace *thread_trace__new(void)
1038 {
1039 struct thread_trace *ttrace = zalloc(sizeof(struct thread_trace));
1040
1041 if (ttrace)
1042 ttrace->files.max = -1;
1043
1044 ttrace->syscall_stats = intlist__new(NULL);
^^^^^^^^
1045
1046 return ttrace;
1047 }
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-6-leo.yan@linaro.org
[ Just made it look like other tools/perf constructors, same end result ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat•com>
Signed-off-by: Sasha Levin <sashal@kernel•org>
---
tools/perf/builtin-trace.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 52fadc858ef0..909e68545bb8 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -997,10 +997,10 @@ static struct thread_trace *thread_trace__new(void)
{
struct thread_trace *ttrace = zalloc(sizeof(struct thread_trace));
- if (ttrace)
+ if (ttrace) {
ttrace->files.max = -1;
-
- ttrace->syscall_stats = intlist__new(NULL);
+ ttrace->syscall_stats = intlist__new(NULL);
+ }
return ttrace;
}
--
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-19 4:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190719035643.14300-1-sashal@kernel.org>
2019-07-19 3:55 ` [PATCH AUTOSEL 5.2 123/171] perf stat: Fix use-after-freed pointer detected by the smatch tool Sasha Levin
2019-07-19 3:55 ` [PATCH AUTOSEL 5.2 125/171] perf top: Fix potential NULL pointer dereference " Sasha Levin
2019-07-19 3:55 ` Sasha Levin [this message]
2019-07-19 3:55 ` [PATCH AUTOSEL 5.2 127/171] perf session: Fix potential NULL pointer dereference found " Sasha Levin
2019-07-19 3:55 ` [PATCH AUTOSEL 5.2 128/171] perf map: Fix potential NULL pointer dereference found by " Sasha Levin
2019-07-19 3:56 ` [PATCH AUTOSEL 5.2 129/171] perf annotate: Fix dereferencing freed memory found by the " Sasha Levin
2019-07-19 3:56 ` [PATCH AUTOSEL 5.2 130/171] perf hists browser: Fix potential NULL pointer dereference " Sasha Levin
2019-07-19 3:56 ` [PATCH AUTOSEL 5.2 133/171] perf intel-bts: " Sasha Levin
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=20190719035643.14300-126-sashal@kernel.org \
--to=sashal@kernel$(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=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