]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
scsi: sd: fix missing put_disk() when device_add(&disk_dev) fails
authorYang Xiuwei <yangxiuwei@kylinos.cn>
Mon, 30 Mar 2026 01:49:52 +0000 (09:49 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 9 Apr 2026 02:10:44 +0000 (22:10 -0400)
If device_add(&sdkp->disk_dev) fails, put_device() runs
scsi_disk_release(), which frees the scsi_disk but leaves the gendisk
referenced. The device_add_disk() error path in sd_probe() calls
put_disk(gd); call put_disk(gd) here to mirror that cleanup.

Fixes: 265dfe8ebbab ("scsi: sd: Free scsi_disk device via put_device()")
Cc: stable@vger.kernel.org
Reviewed-by: John Garry <john.g.garry@oracle.com>
Signed-off-by: Yang Xiuwei <yangxiuwei@kylinos.cn>
Link: https://patch.msgid.link/20260330014952.152776-1-yangxiuwei@kylinos.cn
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/sd.c

index 205877b1f8aae5062bf2e2f1fba5f1af5313852c..adc3fa55ca2c37834f39abd9b32a50f71ed8b2ee 100644 (file)
@@ -4061,6 +4061,7 @@ static int sd_probe(struct scsi_device *sdp)
        error = device_add(&sdkp->disk_dev);
        if (error) {
                put_device(&sdkp->disk_dev);
+               put_disk(gd);
                goto out;
        }