diff options
| author | Yin Honghua-R63875 <Hong-Hua.Yin@freescale.com> | 2015-11-09 01:45:51 (GMT) |
|---|---|---|
| committer | Yin Honghua-R63875 <Hong-Hua.Yin@freescale.com> | 2015-11-09 01:45:51 (GMT) |
| commit | 61f0e119c752d7b66f974089de465729599ef7b2 (patch) | |
| tree | 5fbab439958c7768eccee0d55e40e0fcab373383 /drivers/staging/fsl_dce/tests/performance_simple/dce_sf_perf_simple.c | |
| parent | cfb981f998cf66d88f903dac8d20c52aa412482b (diff) | |
| parent | 300c3ff86988bc13e310b58d9c7c786528697150 (diff) | |
| download | linux-fsl-qoriq-61f0e119c752d7b66f974089de465729599ef7b2.tar.xz | |
Merge pull request #61 in SDK/linux-devel from ~R54964/linux-devel:bug-fix to master
* commit '300c3ff86988bc13e310b58d9c7c786528697150':
fsl-qbman: Handle memory leaks
fsl-pme: Check for null pointers
fsl-dce: Handle memory allocation failures
fsl-dce: Correct error paths and add new labels
fsl_qbman: null check for lni in qman_ceemt_sp_release
Diffstat (limited to 'drivers/staging/fsl_dce/tests/performance_simple/dce_sf_perf_simple.c')
| -rw-r--r-- | drivers/staging/fsl_dce/tests/performance_simple/dce_sf_perf_simple.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/staging/fsl_dce/tests/performance_simple/dce_sf_perf_simple.c b/drivers/staging/fsl_dce/tests/performance_simple/dce_sf_perf_simple.c index d0e5fe0..10154b1 100644 --- a/drivers/staging/fsl_dce/tests/performance_simple/dce_sf_perf_simple.c +++ b/drivers/staging/fsl_dce/tests/performance_simple/dce_sf_perf_simple.c @@ -926,8 +926,10 @@ static int do_operation(void) for (i = 0; i < chunk_count; i++) { def_process_req = kzalloc(sizeof(*def_process_req), GFP_KERNEL); - if (!def_process_req) + if (!def_process_req) { pr_err("Line %d\n", __LINE__); + return -ENOMEM; + } def_process_req->extra_data_size = i; @@ -1065,6 +1067,11 @@ try_again: } i++; } + + if (!def_process_req) { + pr_err("Line %d\n", __LINE__); + return -EINVAL; + } /* wait for last request to be processed */ wait_for_completion(&def_process_req->cb_done); end_time = mfatb(); @@ -1092,8 +1099,10 @@ done: pr_info("Total output required %d\n", total_out); test_data->out_data_len = total_out; test_data->out_data = vmalloc(total_out); - if (!test_data->out_data) + if (!test_data->out_data) { pr_err("vmalloc FAILED\n"); + return -ENOMEM; + } p_out = test_data->out_data; /* copy output */ |