FAILED: patch "[PATCH] rpmsg: core: Clean up resources on announce_create failure." failed to apply to 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 23, 2022

Subsystems (2)

Stable branch Remote processor messaging (rpmsg)

lore

Share & tools

lore

[email protected]

author maintainer

2022-01-23 16:09 UTC #0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 8066c615cb69b7da8a94f59379847b037b3a5e46 Mon Sep 17 00:00:00 2001
From: Arnaud Pouliquen <[email protected]>
Date: Mon, 6 Dec 2021 20:07:58 +0100
Subject: [PATCH] rpmsg: core: Clean up resources on announce_create failure.

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 5e619b48677c ("rpmsg: Split rpmsg core and virtio backend")

Signed-off-by Arnaud Pouliquen <[email protected]>

Reviewed-by Bjorn Andersson <[email protected]>

Cc stable <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Mathieu Poirier <[email protected]>

drivers/rpmsg/rpmsg_core.c +16 -4

index f031b2b1b21c..d9e612f4f0f2 100644
@@ -540,13 +540,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;
 }