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

Commit 9362dd11 authored by Martin Wilck's avatar Martin Wilck Committed by Jens Axboe
Browse files

blkdev: __blkdev_direct_IO_simple: fix leak in error case 



Fixes: 72ecad22 ("block: support a full bio worth of IO for simplified bdev direct-io")
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin Wilck <mwilck@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b403ea24

fs/block_dev.c

+5 −4
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, 


	ret = bio_iov_iter_get_pages(&bio, iter);

	if (unlikely(ret))

		return ret;

		goto out;

	ret = bio.bi_iter.bi_size;



	if (iov_iter_rw(iter) == READ) {
@@ -249,12 +249,13 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, 
		put_page(bvec->bv_page);

	}



	if (vecs != inline_vecs)

		kfree(vecs);



	if (unlikely(bio.bi_status))

		ret = blk_status_to_errno(bio.bi_status);



out:

	if (vecs != inline_vecs)

		kfree(vecs);



	bio_uninit(&bio);



	return ret;