soc: microchip: mpfs: Fix memory leak in mpfs_sys_controller_probe()

In mpfs_sys_controller_probe(), if of_get_mtd_device_by_node() fails,
the function returns immediately without freeing the allocated memory
for sys_controller, leading to a memory leak.

Fix this by jumping to the out_free label to ensure the memory is
properly freed.

Also, consolidate the error handling for the mbox_request_channel()
failure case to use the same label.

Fixes: 742aa6c563d2 ("soc: microchip: mpfs: enable access to the system controller's flash")
Co-developed-by: Jianhao Xu <jianhao.xu@seu.edu.cn>
Signed-off-by: Jianhao Xu <jianhao.xu@seu.edu.cn>
Signed-off-by: Zilin Guan <zilin@seu.edu.cn>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/drivers/soc/microchip/mpfs-sys-controller.c b/drivers/soc/microchip/mpfs-sys-controller.c
index 30bc45d17d3434f310f687812d3f2445111e5082..81636cfecd37eead9f4f24d782f74109772791d6 100644 (file)
--- a/drivers/soc/microchip/mpfs-sys-controller.c
+++ b/drivers/soc/microchip/mpfs-sys-controller.c
@@ -142,8 +142,10 @@ static int mpfs_sys_controller_probe(struct platform_device *pdev)
 
        sys_controller->flash = of_get_mtd_device_by_node(np);
        of_node_put(np);
-       if (IS_ERR(sys_controller->flash))
-               return dev_err_probe(dev, PTR_ERR(sys_controller->flash), "Failed to get flash\n");
+       if (IS_ERR(sys_controller->flash)) {
+               ret = dev_err_probe(dev, PTR_ERR(sys_controller->flash), "Failed to get flash\n");
+               goto out_free;
+       }
 
 no_flash:
        sys_controller->client.dev = dev;
@@ -155,8 +157,7 @@ no_flash:
        if (IS_ERR(sys_controller->chan)) {
                ret = dev_err_probe(dev, PTR_ERR(sys_controller->chan),
                                    "Failed to get mbox channel\n");
-               kfree(sys_controller);
-               return ret;
+               goto out_free;
        }
 
        init_completion(&sys_controller->c);
@@ -174,6 +175,10 @@ no_flash:
        dev_info(&pdev->dev, "Registered MPFS system controller\n");
 
        return 0;
+
+out_free:
+       kfree(sys_controller);
+       return ret;
 }
 
 static void mpfs_sys_controller_remove(struct platform_device *pdev)