scsi: fix memory leak of sdpk on when gd fails to allocate

On an allocation failure of gd, the current exit path is via
out_free_devt which leaves sdpk still allocated and hence it gets
leaked. Fix this by correcting the order of resource free'ing with a
change in the error exit path labels.

Detected by CoverityScan, CID#1399519 ("Resource Leak")

Fixes: 0dba1314d4f81115dc ("scsi, block: fix duplicate bdi name registration crashes")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index b9b32f5811e074e5466b07ccab45ebf7045856f3..8e4f4f72ea64479555bc4381d2bdb47a75f67a05 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3213,10 +3213,10 @@ static int sd_probe(struct device *dev)
        sd_devt = NULL;
  out_put:
        put_disk(gd);
- out_free:
-       kfree(sdkp);
  out_free_devt:
        kfree(sd_devt);
+ out_free:
+       kfree(sdkp);
  out:
        scsi_autopm_put_device(sdp);
        return error;