lkml.org 
[lkml]   [2018]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 216/246] blkdev: __blkdev_direct_IO_simple: fix leak in error case
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Martin Wilck <mwilck@suse.com>

    commit 9362dd1109f87a9d0a798fbc890cb339c171ed35 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/block_dev.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/fs/block_dev.c
    +++ b/fs/block_dev.c
    @@ -231,7 +231,7 @@ __blkdev_direct_IO_simple(struct kiocb *

    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) {
    @@ -260,12 +260,13 @@ __blkdev_direct_IO_simple(struct kiocb *
    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;

    \
     
     \ /
      Last update: 2018-08-01 19:51    [W:2.727 / U:1.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site