[tip:perf/core] perf session: Fix possible null pointer dereference in session.c

[tip-bot for Masanari Iida]

Commit-ID:  c5765ece8a050836c6255e1276fc8e0e867078da
Gitweb:     http://git.kernel.org/tip/c5765ece8a050836c6255e1276fc8e0e867078da
Author:     Masanari Iida <standby24x7@xxxxxxxxx>
AuthorDate: Thu, 15 May 2014 02:13:38 +0900
Committer:  Jiri Olsa <jolsa@xxxxxxxxxx>
CommitDate: Fri, 16 May 2014 09:18:51 +0200

perf session: Fix possible null pointer dereference in session.c

cppcheck detected following warning:
[tools/perf/util/session.c:1628] -> [tools/perf/util/session.c:1632]:
 (warning) Possible null pointer dereference: session - otherwise it
 is redundant to check it against null.

In order to avoide null pointer, check the pointer before use.

Signed-off-by: Masanari Iida <standby24x7@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1400087618-13628-1-git-send-email-standby24x7@xxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
 tools/perf/util/session.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 55960f2..64a186e 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1625,13 +1625,14 @@ out_delete_map:
 void perf_session__fprintf_info(struct perf_session *session, FILE *fp,
 				bool full)
 {
-	int fd = perf_data_file__fd(session->file);
 	struct stat st;
-	int ret;
+	int fd, ret;
 
 	if (session == NULL || fp == NULL)
 		return;
 
+	fd = perf_data_file__fd(session->file);
+
 	ret = fstat(fd, &st);
 	if (ret == -1)
 		return;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/