Commit b728b529 authored Dec 06, 2021 by Arnaud Pouliquen Committed by Greg Kroah-Hartman Jan 27, 2022

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: 5e619b48 ("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>

parent 9e2c8bd7

drivers/rpmsg/rpmsg_core.c

+16 −4

Original line number	Diff line number	Diff line
		@@ -473,13 +473,25 @@ static int rpmsg_dev_probe(struct device *dev)
		err = rpdrv->probe(rpdev);
		if (err) {
		dev_err(dev, "%s: failed: %d\n", __func__, err);
		if (ept)
		rpmsg_destroy_ept(ept);
		goto out;
		goto destroy_ept;
		}

		if (ept && rpdev->ops->announce_create)
		if (ept && rpdev->ops->announce_create) {
		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:
		return err;
		}