scsi: core: scsi_ioctl: Fix error code propagation in SG_IO

halil-pasic · martinkpetersen · commit 04a71cdc46a9 · 2021-08-24T22:56:32.000-04:00
Link: https://lore.kernel.org/r/20210823133458.3536824-1-pasic@linux.ibm.com Fixes: f2542a3 ("scsi: scsi_ioctl: Move the "block layer" SCSI ioctl handling to drivers/scsi") Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Halil Pasic <pasic@linux.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
@@ -874,7 +874,7 @@ static int scsi_ioctl_sg_io(struct scsi_device *sdev, struct gendisk *disk,
 		return error;
 	if (put_sg_io_hdr(&hdr, argp))
 		return -EFAULT;
-	return 0;
+	return error;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -874,7 +874,7 @@ static int scsi_ioctl_sg_io(struct scsi_device sdev, struct gendisk disk,`
`874`	`874`	`return error;`
`875`	`875`	`if (put_sg_io_hdr(&hdr, argp))`
`876`	`876`	`return -EFAULT;`
`877`		`- return 0;`
	`877`	`+ return error;`
`878`	`878`	`}`
`879`	`879`
`880`	`880`	`/**`