Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "coresight: perf: Fix NULL point dereference issue"

Browse source
This commit is contained in:
qctecmdr 2020-06-18 08:38:16 -07:00 committed by Gerrit - the friendly Code Review server
commit bafe345d8d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/hwtracing/coresight/coresight-etm-perf.c
View file

@ -220,6 +220,8 @@ static void *etm_setup_aux(struct perf_event *event, void **pages,
return NULL;
INIT_WORK(&event_data->work, free_event_data);
mask = &event_data->mask;
/* First get the selected sink from user space. */
if (event->attr.config2) {
id = (u32)event->attr.config2;
@ -228,11 +230,10 @@ static void *etm_setup_aux(struct perf_event *event, void **pages,
sink = coresight_get_enabled_sink(true);
}
if (!sink)
if (!sink) {
cpumask_clear(mask);
goto err;
mask = &event_data->mask;
}
/*
* Setup the path for each CPU in a trace session. We try to build
* trace path for each CPU in the mask. If we don't find an ETM