* [PATCH -tip] perf hists browser: Fix seg fault when annotate null symbol
@ 2011-04-08 6:31 Lin Ming
2011-04-12 7:32 ` Lin Ming
2011-04-18 15:51 ` [tip:perf/urgent] " tip-bot for Lin Ming
0 siblings, 2 replies; 3+ messages in thread
From: Lin Ming @ 2011-04-08 6:31 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo; +Cc: lkml
In hists browser, press hotkey 'a' to annotate current symbol.
Now it causes segment fault if 'a' is pressed on a null symbol.
Here are 2 small bugs:
- In perf_evsel__hists_browse, the condition check after 'a' is pressed
is not correct, we should check ->sym instead of ->map.
- In symbol__tui_annotate we must check whether sym is NULL or not
before getting annotation structure.
This patch fixes above 2 small bugs.
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
tools/perf/util/ui/browsers/annotate.c | 6 ++++--
tools/perf/util/ui/browsers/hists.c | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 8c17a87..15633d6 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -256,10 +256,9 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
int refresh)
{
struct objdump_line *pos, *n;
- struct annotation *notes = symbol__annotation(sym);
+ struct annotation *notes;
struct annotate_browser browser = {
.b = {
- .entries = ¬es->src->source,
.refresh = ui_browser__list_head_refresh,
.seek = ui_browser__list_head_seek,
.write = annotate_browser__write,
@@ -281,6 +280,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
ui_helpline__push("Press <- or ESC to exit");
+ notes = symbol__annotation(sym);
+
list_for_each_entry(pos, ¬es->src->source, node) {
struct objdump_line_rb_node *rbpos;
size_t line_len = strlen(pos->line);
@@ -291,6 +292,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
rbpos->idx = browser.b.nr_entries++;
}
+ browser.b.entries = ¬es->src->source,
browser.b.width += 18; /* Percentage */
ret = annotate_browser__run(&browser, evidx, refresh);
list_for_each_entry_safe(pos, n, ¬es->src->source, node) {
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index 798efdc..5d767c6 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -851,7 +851,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel,
goto out_free_stack;
case 'a':
if (browser->selection == NULL ||
- browser->selection->map == NULL ||
+ browser->selection->sym == NULL ||
browser->selection->map->dso->annotate_warned)
continue;
goto do_annotate;
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH -tip] perf hists browser: Fix seg fault when annotate null symbol
2011-04-08 6:31 [PATCH -tip] perf hists browser: Fix seg fault when annotate null symbol Lin Ming
@ 2011-04-12 7:32 ` Lin Ming
2011-04-18 15:51 ` [tip:perf/urgent] " tip-bot for Lin Ming
1 sibling, 0 replies; 3+ messages in thread
From: Lin Ming @ 2011-04-12 7:32 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo; +Cc: lkml
On Fri, 2011-04-08 at 14:31 +0800, Lin Ming wrote:
> In hists browser, press hotkey 'a' to annotate current symbol.
> Now it causes segment fault if 'a' is pressed on a null symbol.
>
> Here are 2 small bugs:
> - In perf_evsel__hists_browse, the condition check after 'a' is pressed
> is not correct, we should check ->sym instead of ->map.
> - In symbol__tui_annotate we must check whether sym is NULL or not
> before getting annotation structure.
>
> This patch fixes above 2 small bugs.
Hi, Arnaldo
Could you have a look at this segment fault fix?
Thanks,
Lin Ming
>
> Signed-off-by: Lin Ming <ming.m.lin@intel.com>
> ---
> tools/perf/util/ui/browsers/annotate.c | 6 ++++--
> tools/perf/util/ui/browsers/hists.c | 2 +-
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
> index 8c17a87..15633d6 100644
> --- a/tools/perf/util/ui/browsers/annotate.c
> +++ b/tools/perf/util/ui/browsers/annotate.c
> @@ -256,10 +256,9 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
> int refresh)
> {
> struct objdump_line *pos, *n;
> - struct annotation *notes = symbol__annotation(sym);
> + struct annotation *notes;
> struct annotate_browser browser = {
> .b = {
> - .entries = ¬es->src->source,
> .refresh = ui_browser__list_head_refresh,
> .seek = ui_browser__list_head_seek,
> .write = annotate_browser__write,
> @@ -281,6 +280,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
>
> ui_helpline__push("Press <- or ESC to exit");
>
> + notes = symbol__annotation(sym);
> +
> list_for_each_entry(pos, ¬es->src->source, node) {
> struct objdump_line_rb_node *rbpos;
> size_t line_len = strlen(pos->line);
> @@ -291,6 +292,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
> rbpos->idx = browser.b.nr_entries++;
> }
>
> + browser.b.entries = ¬es->src->source,
> browser.b.width += 18; /* Percentage */
> ret = annotate_browser__run(&browser, evidx, refresh);
> list_for_each_entry_safe(pos, n, ¬es->src->source, node) {
> diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
> index 798efdc..5d767c6 100644
> --- a/tools/perf/util/ui/browsers/hists.c
> +++ b/tools/perf/util/ui/browsers/hists.c
> @@ -851,7 +851,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel,
> goto out_free_stack;
> case 'a':
> if (browser->selection == NULL ||
> - browser->selection->map == NULL ||
> + browser->selection->sym == NULL ||
> browser->selection->map->dso->annotate_warned)
> continue;
> goto do_annotate;
>
^ permalink raw reply [flat|nested] 3+ messages in thread* [tip:perf/urgent] perf hists browser: Fix seg fault when annotate null symbol
2011-04-08 6:31 [PATCH -tip] perf hists browser: Fix seg fault when annotate null symbol Lin Ming
2011-04-12 7:32 ` Lin Ming
@ 2011-04-18 15:51 ` tip-bot for Lin Ming
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Lin Ming @ 2011-04-18 15:51 UTC (permalink / raw)
To: linux-tip-commits; +Cc: acme, linux-kernel, hpa, mingo, ming.m.lin, tglx
Commit-ID: db9a9cbc8142eed008e242e389938689c6feb1ba
Gitweb: http://git.kernel.org/tip/db9a9cbc8142eed008e242e389938689c6feb1ba
Author: Lin Ming <ming.m.lin@intel.com>
AuthorDate: Fri, 8 Apr 2011 14:31:26 +0800
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 15 Apr 2011 12:51:49 -0300
perf hists browser: Fix seg fault when annotate null symbol
In hists browser, press hotkey 'a' to annotate current symbol.
Now it causes segment fault if 'a' is pressed on a null symbol.
Here are 2 small bugs:
- In perf_evsel__hists_browse, the condition check after 'a' is pressed
is not correct, we should check ->sym instead of ->map.
- In symbol__tui_annotate we must check whether sym is NULL or not
before getting annotation structure.
This patch fixes above 2 small bugs.
Link: http://lkml.kernel.org/r/1302244286.4106.36.camel@minggr.sh.intel.com
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/ui/browsers/annotate.c | 6 ++++--
tools/perf/util/ui/browsers/hists.c | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 8c17a87..15633d6 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -256,10 +256,9 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
int refresh)
{
struct objdump_line *pos, *n;
- struct annotation *notes = symbol__annotation(sym);
+ struct annotation *notes;
struct annotate_browser browser = {
.b = {
- .entries = ¬es->src->source,
.refresh = ui_browser__list_head_refresh,
.seek = ui_browser__list_head_seek,
.write = annotate_browser__write,
@@ -281,6 +280,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
ui_helpline__push("Press <- or ESC to exit");
+ notes = symbol__annotation(sym);
+
list_for_each_entry(pos, ¬es->src->source, node) {
struct objdump_line_rb_node *rbpos;
size_t line_len = strlen(pos->line);
@@ -291,6 +292,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
rbpos->idx = browser.b.nr_entries++;
}
+ browser.b.entries = ¬es->src->source,
browser.b.width += 18; /* Percentage */
ret = annotate_browser__run(&browser, evidx, refresh);
list_for_each_entry_safe(pos, n, ¬es->src->source, node) {
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index 798efdc..5d767c6 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -851,7 +851,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel,
goto out_free_stack;
case 'a':
if (browser->selection == NULL ||
- browser->selection->map == NULL ||
+ browser->selection->sym == NULL ||
browser->selection->map->dso->annotate_warned)
continue;
goto do_annotate;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-04-18 15:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-08 6:31 [PATCH -tip] perf hists browser: Fix seg fault when annotate null symbol Lin Ming
2011-04-12 7:32 ` Lin Ming
2011-04-18 15:51 ` [tip:perf/urgent] " tip-bot for Lin Ming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome