From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Anton Arapov <anton@redhat.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Oleg Nesterov <oleg@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Steven Rostedt <rostedt@goodmis.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 12/15] perf symbols: Check for valid dso before creating map
Date: Fri, 1 Jun 2012 19:16:36 -0300 [thread overview]
Message-ID: <1338588999-32509-13-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1338588999-32509-1-git-send-email-acme@infradead.org>
From: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
dso__new() can return NULL. Hence verify dso before creating a new map.
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Suggested-by: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anton Arapov <anton@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/20120531114656.23691.54223.sendpatchset@srdronam.in.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/symbol.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 9d04dcd..3e2e5ea 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -2817,8 +2817,11 @@ int machine__load_vmlinux_path(struct machine *machine, enum map_type type,
struct map *dso__new_map(const char *name)
{
+ struct map *map = NULL;
struct dso *dso = dso__new(name);
- struct map *map = map__new2(0, dso, MAP__FUNCTION);
+
+ if (dso)
+ map = map__new2(0, dso, MAP__FUNCTION);
return map;
}
--
1.7.1
next prev parent reply other threads:[~2012-06-01 22:18 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-01 22:16 [GIT PULL 00/15] perf/urgent fixes Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 01/15] perf script: Fix regression in callchain dso name Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 02/15] perf tools: Fix make tarballs Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 03/15] perf tools: Fix pager on minimal-install embedded systems Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 04/15] perf callchain: Make callchain cursors TLS Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 05/15] perf tools: Check if callchain is corrupted Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 06/15] perf tools: Make --version show kernel version instead of pull req tag Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 07/15] perf tools: Update ioctl documentation for PERF_IOC_FLAG_GROUP Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 08/15] perf evlist: Pass third argument to ioctl explicitly Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 09/15] perf symbols: Handle different endians properly during symbol load Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 10/15] perf session: Handle endianity swap on sample_id_all header data Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 11/15] perf evsel: Fix 32 bit values endianity swap for sample_id_all header Arnaldo Carvalho de Melo
2012-06-01 22:16 ` Arnaldo Carvalho de Melo [this message]
2012-06-01 22:16 ` [PATCH 13/15] perf uprobes: Remove unnecessary check before strlist__delete Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 14/15] perf: Remove duplicate invocation on perf_event_for_each Arnaldo Carvalho de Melo
2012-06-01 22:16 ` [PATCH 15/15] perf tool: Build fix, remove duplicate declarations Arnaldo Carvalho de Melo
2012-06-01 22:45 ` [GIT PULL 00/15] perf/urgent fixes David Ahern
2012-06-01 23:08 ` Arnaldo Carvalho de Melo
2012-06-06 6:50 ` Ingo Molnar
2012-06-06 22:50 ` David Ahern
2012-06-07 2:19 ` Namhyung Kim
2012-06-07 3:52 ` David Ahern
2012-06-07 16:09 ` Arnaldo Carvalho de Melo
2012-06-07 16:11 ` Steven Rostedt
2012-06-07 16:43 ` Arnaldo Carvalho de Melo
2012-06-07 16:55 ` Borislav Petkov
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=1338588999-32509-13-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=acme@redhat.com \
--cc=ananth@in.ibm.com \
--cc=anton@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=srikar@linux.vnet.ibm.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).