diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2010-10-09 12:12:13 +1030 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-09 11:42:37 -0700 |
| commit | e4c4776dea9fd0295ebb3b215599d52938d6d7a3 (patch) | |
| tree | 4899150e0268f447898a5180ecf43d0783afc9ee | |
| parent | 6b0cd00bc396daf5c2dcf17a8d82055335341f46 (diff) | |
| download | linux-3.10-e4c4776dea9fd0295ebb3b215599d52938d6d7a3.tar.gz linux-3.10-e4c4776dea9fd0295ebb3b215599d52938d6d7a3.tar.bz2 linux-3.10-e4c4776dea9fd0295ebb3b215599d52938d6d7a3.zip | |
virtio-blk: fix request leak.
Must drop reference taken by blk_make_request().
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: stable@kernel.org # .35.x
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/block/virtio_blk.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 2aafafca2b1..1101e251a62 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -202,6 +202,7 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str) struct virtio_blk *vblk = disk->private_data; struct request *req; struct bio *bio; + int err; bio = bio_map_kern(vblk->disk->queue, id_str, VIRTIO_BLK_ID_BYTES, GFP_KERNEL); @@ -215,7 +216,10 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str) } req->cmd_type = REQ_TYPE_SPECIAL; - return blk_execute_rq(vblk->disk->queue, vblk->disk, req, false); + err = blk_execute_rq(vblk->disk->queue, vblk->disk, req, false); + blk_put_request(req); + + return err; } static int virtblk_locked_ioctl(struct block_device *bdev, fmode_t mode, |