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

rpmsg: core: Clean up resources on announce_create failure. 

commit 8066c615cb69b7da8a94f59379847b037b3a5e46 upstream.

During the rpmsg_dev_probe, if rpdev->ops->announce_create returns an
error, the rpmsg device and default endpoint should be freed before
exiting the function.

Fixes: 5e619b4867 ("rpmsg: Split rpmsg core and virtio backend")
Suggested-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20211206190758.10004-1-arnaud.pouliquen@foss.st.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnaud Pouliquen 2021-12-06 20:07:58 +01:00 committed by Greg Kroah-Hartman
parent 591a1e2ef0
commit e2b53845a9
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/rpmsg/rpmsg_core.c
View File

@ -519,13 +519,25 @@ static int rpmsg_dev_probe(struct device *dev)
err = rpdrv->probe(rpdev); err = rpdrv->probe(rpdev);
if (err) { if (err) {
dev_err(dev, "%s: failed: %d\n", __func__, err); dev_err(dev, "%s: failed: %d\n", __func__, err);
if (ept) goto destroy_ept;
rpmsg_destroy_ept(ept);
goto out;
} }
if (ept && rpdev->ops->announce_create) if (ept && rpdev->ops->announce_create) {
err = rpdev->ops->announce_create(rpdev); err = rpdev->ops->announce_create(rpdev);
if (err) {
dev_err(dev, "failed to announce creation\n");
goto remove_rpdev;
}
}
return 0;
remove_rpdev:
if (rpdrv->remove)
rpdrv->remove(rpdev);
destroy_ept:
if (ept)
rpmsg_destroy_ept(ept);
out: out:
return err; return err;
} }