From: Li Nan <linan122@huawei.com>
Date: Fri, 8 Dec 2023 08:23:35 +0000 (+0800)
Subject: scsi: sd: Unregister device if device_add_disk() failed in sd_probe()
X-Git-Tag: v6.8.5~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3cd8b9028f4fc7e74b26bf3cb1ea82ae9a00b55;p=thirdparty%2Fkernel%2Fstable.git

scsi: sd: Unregister device if device_add_disk() failed in sd_probe()

[ Upstream commit 0296bea01cfa6526be6bd2d16dc83b4e7f1af91f ]

"if device_add() succeeds, you should call device_del() when you want to
get rid of it."

In sd_probe(), device_add_disk() fails when device_add() has already
succeeded, so change put_device() to device_unregister() to ensure device
resources are released.

Fixes: 2a7a891f4c40 ("scsi: sd: Add error handling support for add_disk()")
Signed-off-by: Li Nan <linan122@huawei.com>
Link: https://lore.kernel.org/r/20231208082335.1754205-1-linan666@huaweicloud.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index d5d3eea006c13..35200a7a73553 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3757,7 +3757,7 @@ static int sd_probe(struct device *dev)
 
 	error = device_add_disk(dev, gd, NULL);
 	if (error) {
-		put_device(&sdkp->disk_dev);
+		device_unregister(&sdkp->disk_dev);
 		put_disk(gd);
 		goto out;
 	}