openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

coresight: perf: deal with error condition properly 

Function coresight_build_path() should return -ENOMEM when kzalloc
fails to allocated the requested memory.  That way callers can deal
with the error condition in a similar way.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathieu Poirier 2016-09-08 16:50:38 -06:00 committed by Greg Kroah-Hartman
parent 3ba1eb17b6
commit 8e67cdbc2f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hwtracing/coresight/coresight-etm-perf.c
View File

@ -135,7 +135,7 @@ static void free_event_data(struct work_struct *work)
} }
for_each_cpu(cpu, mask) { for_each_cpu(cpu, mask) {
if (event_data->path[cpu]) if (!(IS_ERR_OR_NULL(event_data->path[cpu])))
coresight_release_path(event_data->path[cpu]); coresight_release_path(event_data->path[cpu]);
} }
@ -220,7 +220,7 @@ static void *etm_setup_aux(int event_cpu, void **pages,
* referenced later when the path is actually needed. * referenced later when the path is actually needed.
*/ */
event_data->path[cpu] = coresight_build_path(csdev); event_data->path[cpu] = coresight_build_path(csdev);
if (!event_data->path[cpu]) if (IS_ERR(event_data->path[cpu]))
goto err; goto err;
} }

2
drivers/hwtracing/coresight/coresight.c
View File

@ -429,7 +429,7 @@ struct list_head *coresight_build_path(struct coresight_device *csdev)
path = kzalloc(sizeof(struct list_head), GFP_KERNEL); path = kzalloc(sizeof(struct list_head), GFP_KERNEL);
if (!path) if (!path)
return NULL; return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(path); INIT_LIST_HEAD(path);