perf report TUI: Fix segmentation fault in perf_evsel__hists_browse()
PATCH 1/1 perf report TUI: Fix segmentation fault in perf_evsel__hists_browse()
The segmentation fault can be reproduced as following steps:
1) Executing perf report in tui.
2) Typing '/xxxxx' to filter the symbol to get nothing matched.
3) Pressing enter with no entry selected.
Then it will report a segmentation fault.
It is caused by the lack of check of browser->he_selection when accessing it's member res_samples in perf_evsel__hists_browse().
These processes are meaningful for specified samples, so we can skip these when nothing is selected.
--- tools/perf/ui/browsers/hists.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
tools/perf/ui/browsers/hists.c +11 -6
@@ -2288,6 +2288,11 @@ static struct thread *hist_browser__selected_thread(struct hist_browser *browserreturn browser->he_selection->thread; } +static struct res_sample *hist_browser__selected_res_sample (struct hist_browser *browser) +{ +return browser->he_selection ? browser->he_selection->res_samples :NULL ; +} +/* Check whether the browser is for 'top' or 'report' */ static inline bool is_report_browser (void *timer) {
@@ -3357,16 +3362,16 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events, &options[nr_options], NULL, NULL, evsel); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_NORMAL ); +hist_browser__selected_res_sample (browser), + evsel,A_NORMAL ); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_ASM ); +hist_browser__selected_res_sample (browser), + evsel,A_ASM ); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_SOURCE ); +hist_browser__selected_res_sample (browser), + evsel,A_SOURCE ); nr_options +=add_switch_opt (browser, &actions[nr_options], &options[nr_options]); skip_scripting:
Signature · 1 line
2.17.1
Hello,
Quoted 7 lines · Wei Li
The segmentation fault can be reproduced as following steps:
1) Executing perf report in tui.
2) Typing '/xxxxx' to filter the symbol to get nothing matched.
3) Pressing enter with no entry selected.
Then it will report a segmentation fault.
Quoted 8 lines
It is caused by the lack of check of
browser->he_selectionwhen accessing it's memberres_samplesinperf_evsel__hists_browse().These processes are meaningful for specified samples, so we can skip these when nothing is selected.
Fixes 4968ac8fb7c3 ("perf report: Implement browsing of individual samples")Signed-off-by Wei Li <[email protected]>
Thanks
Namhyung
Quoted 46 lines
--- tools/perf/ui/browsers/hists.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)tools/perf/ui/browsers/hists.c +11
-7@@ -2288,6 +2288,11 @@ static struct thread *hist_browser__selected_thread(struct hist_browser *browserreturn browser->he_selection->thread; } +static struct res_sample *hist_browser__selected_res_sample (struct hist_browser *browser) +{ +return browser->he_selection ? browser->he_selection->res_samples :NULL ; +} +/* Check whether the browser is for 'top' or 'report' */ static inline bool is_report_browser (void *timer) {@@ -3357,16 +3362,16 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events, &options[nr_options], NULL, NULL, evsel); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_NORMAL ); +hist_browser__selected_res_sample (browser), + evsel,A_NORMAL ); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_ASM ); +hist_browser__selected_res_sample (browser), + evsel,A_ASM ); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_SOURCE ); +hist_browser__selected_res_sample (browser), + evsel,A_SOURCE ); nr_options +=add_switch_opt (browser, &actions[nr_options], &options[nr_options]); skip_scripting: --2.17.1
Ping...
Quoted 71 lines · Namhyung Kim
Hello,
Quoted 7 lines · Wei Li
The segmentation fault can be reproduced as following steps:
1) Executing perf report in tui.
2) Typing '/xxxxx' to filter the symbol to get nothing matched.
3) Pressing enter with no entry selected.
Then it will report a segmentation fault.Quoted 8 lines
It is caused by the lack of check of
browser->he_selectionwhen accessing it's memberres_samplesinperf_evsel__hists_browse().These processes are meaningful for specified samples, so we can skip these when nothing is selected.
Fixes 4968ac8fb7c3 ("perf report: Implement browsing of individual samples")Signed-off-by Wei Li <[email protected]>Acked-by Namhyung Kim <[email protected]>Thanks
NamhyungQuoted 46 lines
--- tools/perf/ui/browsers/hists.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)tools/perf/ui/browsers/hists.c +11
-7@@ -2288,6 +2288,11 @@ static struct thread *hist_browser__selected_thread(struct hist_browser *browserreturn browser->he_selection->thread; } +static struct res_sample *hist_browser__selected_res_sample (struct hist_browser *browser) +{ +return browser->he_selection ? browser->he_selection->res_samples :NULL ; +} +/* Check whether the browser is for 'top' or 'report' */ static inline bool is_report_browser (void *timer) {@@ -3357,16 +3362,16 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events, &options[nr_options], NULL, NULL, evsel); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_NORMAL ); +hist_browser__selected_res_sample (browser), + evsel,A_NORMAL ); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_ASM ); +hist_browser__selected_res_sample (browser), + evsel,A_ASM ); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_SOURCE ); +hist_browser__selected_res_sample (browser), + evsel,A_SOURCE ); nr_options +=add_switch_opt (browser, &actions[nr_options], &options[nr_options]); skip_scripting: --2.17.1
Arnaldo Carvalho de Melo
maintainerEm Fri, Jul 03, 2020 at 09:03:53AM +0800, liwei (GF) escreveu:
Quoted 1 line
Ping...
Thanks, applied and tested, added the Acked-by Jiri and Namhyung provided,
- Arnaldo
Quoted 72 lines · Namhyung Kim
Quoted 71 lines
Hello,
Quoted 7 lines · Wei Li
The segmentation fault can be reproduced as following steps:
1) Executing perf report in tui.
2) Typing '/xxxxx' to filter the symbol to get nothing matched.
3) Pressing enter with no entry selected.
Then it will report a segmentation fault.Quoted 8 lines
It is caused by the lack of check of
browser->he_selectionwhen accessing it's memberres_samplesinperf_evsel__hists_browse().These processes are meaningful for specified samples, so we can skip these when nothing is selected.
Fixes 4968ac8fb7c3 ("perf report: Implement browsing of individual samples")Signed-off-by Wei Li <[email protected]>Acked-by Namhyung Kim <[email protected]>Thanks
NamhyungQuoted 46 lines
--- tools/perf/ui/browsers/hists.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)tools/perf/ui/browsers/hists.c +11
-7@@ -2288,6 +2288,11 @@ static struct thread *hist_browser__selected_thread(struct hist_browser *browserreturn browser->he_selection->thread; } +static struct res_sample *hist_browser__selected_res_sample (struct hist_browser *browser) +{ +return browser->he_selection ? browser->he_selection->res_samples :NULL ; +} +/* Check whether the browser is for 'top' or 'report' */ static inline bool is_report_browser (void *timer) {@@ -3357,16 +3362,16 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events, &options[nr_options], NULL, NULL, evsel); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_NORMAL ); +hist_browser__selected_res_sample (browser), + evsel,A_NORMAL ); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_ASM ); +hist_browser__selected_res_sample (browser), + evsel,A_ASM ); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_SOURCE ); +hist_browser__selected_res_sample (browser), + evsel,A_SOURCE ); nr_options +=add_switch_opt (browser, &actions[nr_options], &options[nr_options]); skip_scripting: --2.17.1
Signature · 1 line
- Arnaldo
Quoted 6 lines · Wei Li
The segmentation fault can be reproduced as following steps:
1) Executing perf report in tui.
2) Typing '/xxxxx' to filter the symbol to get nothing matched.
3) Pressing enter with no entry selected.
Then it will report a segmentation fault.
Quoted 8 lines
It is caused by the lack of check of
browser->he_selectionwhen accessing it's memberres_samplesinperf_evsel__hists_browse().These processes are meaningful for specified samples, so we can skip these when nothing is selected.
Fixes 4968ac8fb7c3 ("perf report: Implement browsing of individual samples")Signed-off-by Wei Li <[email protected]>
thanks,
jirka
Quoted 46 lines
--- tools/perf/ui/browsers/hists.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)tools/perf/ui/browsers/hists.c +11
-6@@ -2288,6 +2288,11 @@ static struct thread *hist_browser__selected_thread(struct hist_browser *browserreturn browser->he_selection->thread; } +static struct res_sample *hist_browser__selected_res_sample (struct hist_browser *browser) +{ +return browser->he_selection ? browser->he_selection->res_samples :NULL ; +} +/* Check whether the browser is for 'top' or 'report' */ static inline bool is_report_browser (void *timer) {@@ -3357,16 +3362,16 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events, &options[nr_options], NULL, NULL, evsel); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_NORMAL ); +hist_browser__selected_res_sample (browser), + evsel,A_NORMAL ); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_ASM ); +hist_browser__selected_res_sample (browser), + evsel,A_ASM ); nr_options +=add_res_sample_opt (browser, &actions[nr_options], &options[nr_options], -hist_browser__selected_entry (browser)->res_samples, - evsel,A_SOURCE ); +hist_browser__selected_res_sample (browser), + evsel,A_SOURCE ); nr_options +=add_switch_opt (browser, &actions[nr_options], &options[nr_options]); skip_scripting:Signature · 1 line
2.17.1