]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
blkdev: __blkdev_direct_IO_simple: fix leak in error case
authorMartin Wilck <mwilck@suse.com>
Wed, 25 Jul 2018 21:15:08 +0000 (23:15 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 26 Jul 2018 17:52:33 +0000 (11:52 -0600)
Fixes: 72ecad22d9f1 ("block: support a full bio worth of IO for simplified bdev direct-io")
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/block_dev.c

index 05e12aea24043dac01826bcc833be0e9e8c2e13b..1920053768847140ef6ae5f272700488ee96d1ed 100644 (file)
@@ -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;