diff options
| author | Tony Battersby <tonyb@cybernetics.com> | 2014-11-10 17:40:02 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-11-10 15:41:47 -0700 |
| commit | 92697dc9471b8655a2f1203fa351bc37b2d46a26 (patch) | |
| tree | 0bd855adedc0422bf693671963c63bddab0cfcd2 /block/scsi_ioctl.c | |
| parent | f3af020b9a8d298022b811a19719df0cf461efa5 (diff) | |
| download | op-kernel-dev-92697dc9471b8655a2f1203fa351bc37b2d46a26.zip op-kernel-dev-92697dc9471b8655a2f1203fa351bc37b2d46a26.tar.gz | |
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: a492f075450f ("block,scsi: fixup blk_get_request dead queue scenarios")
Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/scsi_ioctl.c')
| -rw-r--r-- | block/scsi_ioctl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 1e053d9..b0c2a61 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -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: + blk_put_request(rq); + +error_free_buffer: kfree(buffer); - if (rq) - blk_put_request(rq); + return err; } EXPORT_SYMBOL_GPL(sg_scsi_ioctl); |
