diff options
| author | Jan Kara <jack@suse.cz> | 2014-10-22 20:13:39 -0600 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-13 11:48:39 +0000 |
| commit | 63d14a37f54edc39a392bce99b874ff480cef48c (patch) | |
| tree | c9071075e6347ff10ac718569410f26f84d43ba4 /block | |
| parent | bcc9af722d3996f3d7bb2f6ef3381a43de9c63d1 (diff) | |
| download | linux-stable-63d14a37f54edc39a392bce99b874ff480cef48c.tar.gz linux-stable-63d14a37f54edc39a392bce99b874ff480cef48c.tar.bz2 linux-stable-63d14a37f54edc39a392bce99b874ff480cef48c.zip | |
scsi: Fix error handling in SCSI_IOCTL_SEND_COMMAND
commit 84ce0f0e94ac97217398b3b69c21c7a62ebeed05 upstream.
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
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>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/scsi_ioctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 84ab119b6ffa..de3bd8287d81 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -490,7 +490,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)); @@ -499,7 +499,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) { |