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

Commit 92697dc9 authored by Tony Battersby's avatar Tony Battersby Committed by Jens Axboe
Browse files

scsi: Fix more error handling in SCSI_IOCTL_SEND_COMMAND 



Fix an error path in SCSI_IOCTL_SEND_COMMAND that calls
blk_put_request(rq) on an invalid IS_ERR(rq) pointer.

Fixes: a492f075 ("block,scsi: fixup blk_get_request dead queue scenarios")
Signed-off-by: default avatarTony Battersby <tonyb@cybernetics.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f3af020b

block/scsi_ioctl.c

+5 −3
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ 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 (IS_ERR(rq)) {

		err = PTR_ERR(rq);

		goto error;

		goto error_free_buffer;

	}

	blk_rq_set_block_pc(rq);
@@ -531,9 +531,11 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 
	}

	

error:

	kfree(buffer);

	if (rq)

	blk_put_request(rq);



error_free_buffer:

	kfree(buffer);



	return err;

}

EXPORT_SYMBOL_GPL(sg_scsi_ioctl);