scsi: core: Fix error handling for scsi_alloc_sdev()

After scsi_sysfs_device_initialize() was called, error paths must call
__scsi_remove_device().

Fixes: 1ac22c8eae81 ("scsi: core: Fix refcount leak for tagset_refcnt")
Cc: stable@vger.kernel.org
Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20260304164603.51528-1-junxiao.bi@oracle.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 2cfcf1f5d6a4655109bca544015dce3d34317353..7b11bc7de0e3902a11bd3bdaa95775f915e65070 100644 (file)
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -360,12 +360,8 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
         * default device queue depth to figure out sbitmap shift
         * since we use this queue depth most of times.
         */
-       if (scsi_realloc_sdev_budget_map(sdev, depth)) {
-               kref_put(&sdev->host->tagset_refcnt, scsi_mq_free_tags);
-               put_device(&starget->dev);
-               kfree(sdev);
-               goto out;
-       }
+       if (scsi_realloc_sdev_budget_map(sdev, depth))
+               goto out_device_destroy;
 
        scsi_change_queue_depth(sdev, depth);