[PATCH v2 2/2] bus: fsl-mc: using put_device() when add_device() failed in fsl_mc_device_add()

Su Hui posted 2 patches 1 week ago
[PATCH v2 2/2] bus: fsl-mc: using put_device() when add_device() failed in fsl_mc_device_add()
Posted by Su Hui 1 week ago
When device_add(&mc_dev->dev) failed, calling put_device() to let
'mc_dev->dev.release' free the resource rather than goto label
error_cleanup_dev. Otherwise, it can cause double free problem.

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/all/b767348e-d89c-416e-acea-1ebbff3bea20@stanley.mountain/
Fixes: 95b3523b723e ("staging: fsl-mc: add device release callback")
Signed-off-by: Su Hui <suhui@nfschina.com>
---
 drivers/bus/fsl-mc/fsl-mc-bus.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index 319a081a29ef..09f8772fed8f 100644
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -895,7 +895,8 @@ int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc,
 		dev_err(parent_dev,
 			"device_add() failed for device %s: %d\n",
 			dev_name(&mc_dev->dev), error);
-		goto error_cleanup_dev;
+		put_device(&mc_dev->dev);
+		return error;
 	}
 
 	dev_dbg(parent_dev, "added %s\n", dev_name(&mc_dev->dev));
-- 
2.30.2