Re: [PATCH v1 06/11] perf hists: Smatch: Fix potential NULL pointer dereference

Jiri Olsa
2019-07-02T11:07:50Z

On Tue, Jul 02, 2019 at 06:34:15PM +0800, Leo Yan wrote:
> Based on the following report from Smatch, fix the potential
> NULL pointer dereference check.
>
> tools/perf/ui/browsers/hists.c:641
> hist_browser__run() error: we previously assumed 'hbt' could be
> null (see line 625)
>
> tools/perf/ui/browsers/hists.c:3088
> perf_evsel__hists_browse() error: we previously assumed
> 'browser->he_selection' could be null (see line 2902)
>
> tools/perf/ui/browsers/hists.c:3272
> perf_evsel_menu__run() error: we previously assumed 'hbt' could be
> null (see line 3260)
>
> This patch firstly validating the pointers before access them, so can
> fix potential NULL pointer dereference.
>
> Signed-off-by: Leo Yan <leo.yan@linaro.org>
> ---
> tools/perf/ui/browsers/hists.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
> index 3421ecbdd3f0..2ba33040ddd8 100644
> --- a/tools/perf/ui/browsers/hists.c
> +++ b/tools/perf/ui/browsers/hists.c
> @@ -638,7 +638,9 @@ int hist_browser__run(struct hist_browser *browser, const char *help,
> switch (key) {
> case K_TIMER: {

not sure this can really happen, perhaps WARN_ON_ONCE(!hbt) would be
good in here

jirka

> u64 nr_entries;
> - hbt->timer(hbt->arg);
> +
> + if (hbt)
> + hbt->timer(hbt->arg);
>
> if (hist_browser__has_filter(browser) ||
> symbol_conf.report_hierarchy)

SNIP