]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
slimbus: qcom-ngd: Add error handling in of_qcom_slim_ngd_register
authorLin Yujun <linyujun809@huawei.com>
Wed, 14 Sep 2022 03:19:53 +0000 (11:19 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Oct 2022 07:57:57 +0000 (09:57 +0200)
[ Upstream commit 42992cf187e4e4bcfe3c58f8fc7b1832c5652d9f ]

No error handling is performed when platform_device_add()
return fails. Refer to the error handling of driver_set_override(),
add error handling for platform_device_add().

Fixes: 917809e2280b ("slimbus: ngd: Add qcom SLIMBus NGD driver")
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Lin Yujun <linyujun809@huawei.com>
Link: https://lore.kernel.org/r/20220914031953.94061-1-linyujun809@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/slimbus/qcom-ngd-ctrl.c

index bacc6af1d51e2289f21d8d14e6c4b756cf488002..d29a1a9cf12fab5daf367f2bc8daa971da23bfee 100644 (file)
@@ -1470,7 +1470,13 @@ static int of_qcom_slim_ngd_register(struct device *parent,
                ngd->pdev->dev.of_node = node;
                ctrl->ngd = ngd;
 
-               platform_device_add(ngd->pdev);
+               ret = platform_device_add(ngd->pdev);
+               if (ret) {
+                       platform_device_put(ngd->pdev);
+                       kfree(ngd);
+                       of_node_put(node);
+                       return ret;
+               }
                ngd->base = ctrl->base + ngd->id * data->offset +
                                        (ngd->id - 1) * data->size;