misc: fastrpc: Fix an error handling path in fastrpc_rpmsg_probe()

[ Upstream commit 11819ed2b70da94acc41fec34178a011c4d3d25d ]

If of_platform_populate() fails, some resources need to be freed as already
done in the other error handling paths.

Fixes: 278d56f970ae ("misc: fastrpc: Reference count channel context")
Fixes: 3abe3ab3cdab ("misc: fastrpc: add secure domain support")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/b909d2f3273b794ea0f1f78d14bc24affb08ea5f.1669398274.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index 80811e852d8fdc48e3231f19f66dc69a6d47215e..02d26160c64e67d4717c766d715e31f101c17b7a 100644 (file)
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -2127,7 +2127,18 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)
        data->domain_id = domain_id;
        data->rpdev = rpdev;
 
-       return of_platform_populate(rdev->of_node, NULL, NULL, rdev);
+       err = of_platform_populate(rdev->of_node, NULL, NULL, rdev);
+       if (err)
+               goto populate_error;
+
+       return 0;
+
+populate_error:
+       if (data->fdevice)
+               misc_deregister(&data->fdevice->miscdev);
+       if (data->secure_fdevice)
+               misc_deregister(&data->secure_fdevice->miscdev);
+
 fdev_error:
        kfree(data);
        return err;