Commit 84ce0f0e authored Oct 22, 2014 by Jan Kara Committed by Jens Axboe Oct 22, 2014

scsi: Fix error handling in SCSI_IOCTL_SEND_COMMAND



When sg_scsi_ioctl() fails to prepare request to submit in
blk_rq_map_kern() we jump to a label where we just end up copying
(luckily zeroed-out) kernel buffer to userspace instead of reporting
error. Fix the problem by jumping to the right label.

CC: Jens Axboe <axboe@kernel.dk>
CC: linux-scsi@vger.kernel.org
CC: stable@vger.kernel.org
Coverity-id: 1226871
Signed-off-by: Jan Kara <jack@suse.cz>

Fixed up the, now unused, out label.

Signed-off-by: Jens Axboe <axboe@fb.com>

parent 31f9690e

block/scsi_ioctl.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -508,7 +508,7 @@ int sg_scsi_ioctl(struct request_queue q, struct gendisk disk, fmode_t mode,

		if (bytes && blk_rq_map_kern(q, rq, buffer, bytes, __GFP_WAIT)) {
		err = DRIVER_ERROR << 24;
		goto out;
		goto error;
		}

		memset(sense, 0, sizeof(sense));
		@@ -517,7 +517,6 @@ int sg_scsi_ioctl(struct request_queue q, struct gendisk disk, fmode_t mode,

		blk_execute_rq(q, disk, rq, 0);

		out:
		err = rq->errors & 0xff; /* only 8 bit SCSI status */
		if (err) {
		if (rq->sense_len && rq->sense) {

Admin message