mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Samuel Liao <samuelliao@tencent.com>,
	Shan Wei <davidshan@tencent.com>, Ingo Molnar <mingo@redhat.com>,
	Namhyung Kim <namhyung.kim@lge.com>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 20/20] perf annotate: Check null of sym pointer before using it
Date: Tue, 19 Jun 2012 14:50:21 -0300	[thread overview]
Message-ID: <1340128221-17348-21-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1340128221-17348-1-git-send-email-acme@infradead.org>

From: Samuel Liao <samuelliao@tencent.com>

Sym may be NULL, and that will cause perf to crash.

Signed-off-by: Shan Wei <davidshan@tencent.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/4FCD95D3.90209@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/ui/browsers/annotate.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 34b1c46..67a2703 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -814,7 +814,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
 {
 	struct disasm_line *pos, *n;
 	struct annotation *notes;
-	const size_t size = symbol__size(sym);
+	size_t size;
 	struct map_symbol ms = {
 		.map = map,
 		.sym = sym,
@@ -834,6 +834,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
 	if (sym == NULL)
 		return -1;
 
+	size = symbol__size(sym);
+
 	if (map->dso->annotate_warned)
 		return -1;
 
-- 
1.7.1


  parent reply	other threads:[~2012-06-19 18:01 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-19 17:50 [GIT PULL 00/20] perf/core improvements Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 01/20] perf tools: Add sort by src line/number Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 02/20] perf ui: Introduce struct perf_error_ops Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 03/20] perf ui/gtk: Introduce struct perf_gtk_context Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 04/20] perf ui/gtk: Add GTK statusbar widget to browser window Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 05/20] perf ui/gtk: Add GTK info_bar " Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 06/20] perf ui/gtk: Use struct perf_error_ops Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 07/20] perf lib: Introduce rtrim Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 08/20] perf hists browser: Implement printing snapshots to files Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 09/20] perf evsel: Carve out event modifier formatting Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 10/20] perf tools: Reconstruct hw cache event with modifiers from perf_event_attr Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 11/20] perf tools: Reconstruct sw " Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 12/20] perf evsel: Handle all event types in perf_evsel__name Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 13/20] perf tools: Move all users of event_name to perf_evsel__name Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 14/20] perf script: Replace __event_name uses with perf_evsel__name Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 15/20] perf tools: Don't access evsel->name directly Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 16/20] perf tools: Remove __event_name Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 17/20] perf evsel: Reconstruct raw event with modifiers from perf_event_attr Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 18/20] perf tools: Remove unused evsel parameter from machine__resolve_callchain Arnaldo Carvalho de Melo
2012-06-19 17:50 ` [PATCH 19/20] perf evsel: Make some methods private Arnaldo Carvalho de Melo
2012-06-19 17:50 ` Arnaldo Carvalho de Melo [this message]
2012-06-20 12:01 ` [GIT PULL 00/20] perf/core improvements Ingo Molnar
2012-06-20 14:07   ` Namhyung Kim
2012-06-20 14:49     ` Ingo Molnar
2012-06-22  4:16       ` Namhyung Kim
2012-06-25  8:22         ` Ingo Molnar

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=1340128221-17348-21-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=davidshan@tencent.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung.kim@lge.com \
    --cc=paulus@samba.org \
    --cc=samuelliao@tencent.com \
    /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

all inboxes | Powered by JetHome®