UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

remoteproc: qcom: Fix error handling paths in order to avoid memory leaks 

In case of error returned by 'q6v5_xfer_mem_ownership', we must free
some resources before returning.

In 'q6v5_mpss_init_image()', add a new label to undo a previous
'dma_alloc_attrs()'.
In 'q6v5_mpss_load()', re-use the already existing error handling code to
undo a previous 'request_firmware()', as already done in the other error
handling paths of the function.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Christophe JAILLET 2017-11-15 07:58:35 +01:00 committed by Bjorn Andersson
parent 9f2a4342a8
commit 1a5d5c592e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/remoteproc/qcom_q6v5_pil.c
View File

@ -580,7 +580,8 @@ static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw)
if (ret) { if (ret) {
dev_err(qproc->dev, dev_err(qproc->dev,
"assigning Q6 access to metadata failed: %d\n", ret); "assigning Q6 access to metadata failed: %d\n", ret);
return -EAGAIN; ret = -EAGAIN;
goto free_dma_attrs;
} }
writel(phys, qproc->rmb_base + RMB_PMI_META_DATA_REG); writel(phys, qproc->rmb_base + RMB_PMI_META_DATA_REG);
@ -599,6 +600,7 @@ static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw)
dev_warn(qproc->dev, dev_warn(qproc->dev,
"mdt buffer not reclaimed system may become unstable\n"); "mdt buffer not reclaimed system may become unstable\n");
free_dma_attrs:
dma_free_attrs(qproc->dev, fw->size, ptr, phys, dma_attrs); dma_free_attrs(qproc->dev, fw->size, ptr, phys, dma_attrs);
return ret < 0 ? ret : 0; return ret < 0 ? ret : 0;
@ -712,7 +714,8 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
if (ret) { if (ret) {
dev_err(qproc->dev, dev_err(qproc->dev,
"assigning Q6 access to mpss memory failed: %d\n", ret); "assigning Q6 access to mpss memory failed: %d\n", ret);
return -EAGAIN; ret = -EAGAIN;
goto release_firmware;
} }
boot_addr = relocate ? qproc->mpss_phys : min_addr; boot_addr = relocate ? qproc->mpss_phys : min_addr;