diff options
author | Tony Battersby <tonyb@cybernetics.com> | 2014-08-22 15:53:35 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-17 09:22:01 -0700 |
commit | 81048fbcbd07a79111277d9e608ef2afb3d90d1e (patch) | |
tree | 02042285fa4084459677e955d7ad88831ff2a6d2 /block | |
parent | 8e9f1b75adc592290d755551723c8e747a81d423 (diff) | |
download | linux-stable-81048fbcbd07a79111277d9e608ef2afb3d90d1e.tar.gz linux-stable-81048fbcbd07a79111277d9e608ef2afb3d90d1e.tar.bz2 linux-stable-81048fbcbd07a79111277d9e608ef2afb3d90d1e.zip |
fix regression in SCSI_IOCTL_SEND_COMMAND
commit 2ba136daa3ae1e881c9f586f283fcaa164767dce upstream.
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: f27b087b81b7 ("block: add blk_rq_set_block_pc()")
Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
-rw-r--r-- | block/scsi_ioctl.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 14695c6221c8..84ab119b6ffa 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -438,6 +438,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); @@ -491,7 +496,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); @@ -511,7 +515,8 @@ out: error: kfree(buffer); - blk_put_request(rq); + if (rq) + blk_put_request(rq); return err; } EXPORT_SYMBOL_GPL(sg_scsi_ioctl); |