Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ba136da authored by Tony Battersby's avatar Tony Battersby Committed by Jens Axboe
Browse files

fix regression in SCSI_IOCTL_SEND_COMMAND 



blk_rq_set_block_pc() memsets rq->cmd to 0, so it should come
immediately after blk_get_request() to avoid overwriting the
user-supplied CDB.  Also check for failure to allocate rq.

Fixes: f27b087b ("block: add blk_rq_set_block_pc()")
Cc: <stable@vger.kernel.org> # 3.16.x
Signed-off-by: default avatarTony Battersby <tonyb@cybernetics.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 6f4a1626

block/scsi_ioctl.c

+7 −2
Original line number Diff line number Diff line
@@ -456,6 +456,11 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 
	}



	rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_WAIT);

	if (!rq) {

		err = -ENOMEM;

		goto error;

	}

	blk_rq_set_block_pc(rq);



	cmdlen = COMMAND_SIZE(opcode);
@@ -509,7 +514,6 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 
	memset(sense, 0, sizeof(sense));

	rq->sense = sense;

	rq->sense_len = 0;

	blk_rq_set_block_pc(rq);



	blk_execute_rq(q, disk, rq, 0);
@@ -529,6 +533,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 
	

error:

	kfree(buffer);

	if (rq)

		blk_put_request(rq);

	return err;

}