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

Commit e4c4776d authored by Mike Snitzer's avatar Mike Snitzer Committed by Linus Torvalds
Browse files

virtio-blk: fix request leak. 



Must drop reference taken by blk_make_request().

Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Cc: stable@kernel.org # .35.x
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6b0cd00b

drivers/block/virtio_blk.c

+5 −1
Original line number Diff line number Diff line
@@ -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,