OSDN Git Service

slimbus: fix a potential NULL pointer dereference in of_qcom_slim_ngd_register
authorKangjie Lu <kjlu@umn.edu>
Sat, 13 Apr 2019 10:34:47 +0000 (11:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 May 2019 13:46:14 +0000 (06:46 -0700)
[ Upstream commit 06d5d6b7f9948a89543e1160ef852d57892c750d ]

In case platform_device_alloc fails, the fix returns an error
code to avoid the NULL pointer dereference.

Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/slimbus/qcom-ngd-ctrl.c

index 14a9d18..f63d1b8 100644 (file)
@@ -1331,6 +1331,10 @@ static int of_qcom_slim_ngd_register(struct device *parent,
                        return -ENOMEM;
 
                ngd->pdev = platform_device_alloc(QCOM_SLIM_NGD_DRV_NAME, id);
+               if (!ngd->pdev) {
+                       kfree(ngd);
+                       return -ENOMEM;
+               }
                ngd->id = id;
                ngd->pdev->dev.parent = parent;
                ngd->pdev->driver_override = QCOM_SLIM_NGD_DRV_NAME;