Commit 21eccf30 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: scsi_ioctl: Return error code when blk_rq_map_kern() fails 

The callers of sg_scsi_ioctl() already check for negative return values, so
we can drop the usage of DRIVER_ERROR and return the error from
blk_rq_map_kern() instead.

Link: https://lore.kernel.org/r/20210427083046.31620-3-hare@suse.de


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 00da6a70

block/scsi_ioctl.c

+4 −3
Original line number Diff line number Diff line
@@ -484,8 +484,9 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 
		break;

	}



	if (bytes && blk_rq_map_kern(q, rq, buffer, bytes, GFP_NOIO)) {

		err = DRIVER_ERROR << 24;

	if (bytes) {

		err = blk_rq_map_kern(q, rq, buffer, bytes, GFP_NOIO);

		if (err)

			goto error;

	}