patches/kernel/0011-blkdev-__blkdev_direct_IO_simple-fix-leak-in-error-c.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Martin Wilck <mwilck@suse.com>
   3 Date: Tue, 9 Oct 2018 17:04:41 +0100
   4 Subject: [PATCH] blkdev: __blkdev_direct_IO_simple: fix leak in error case
   5
   6 Buglink: https://bugs.launchpad.net/bugs/1796542
   7
   8 Fixes: 72ecad22d9f1 ("block: support a full bio worth of IO for simplified bdev direct-io")
   9 Reviewed-by: Ming Lei <ming.lei@redhat.com>
  10 Reviewed-by: Hannes Reinecke <hare@suse.com>
  11 Reviewed-by: Christoph Hellwig <hch@lst.de>
  12 Signed-off-by: Martin Wilck <mwilck@suse.com>
  13 Signed-off-by: Jens Axboe <axboe@kernel.dk>
  14 (cherry picked from commit 9362dd1109f87a9d0a798fbc890cb339c171ed35)
  15 Signed-off-by: Colin Ian King <colin.king@canonical.com>
  16 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  17 ---
  18  fs/block_dev.c | 9 +++++----
  19  1 file changed, 5 insertions(+), 4 deletions(-)
  20
  21 diff --git a/fs/block_dev.c b/fs/block_dev.c
  22 index 82c823ef06a6..74b4ae9b7ba0 100644
  23 --- a/fs/block_dev.c
  24 +++ b/fs/block_dev.c
  25 @@ -219,7 +219,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,
  26
  27         ret = bio_iov_iter_get_pages(&bio, iter);
  28         if (unlikely(ret))
  29 -               return ret;
  30 +               goto out;
  31         ret = bio.bi_iter.bi_size;
  32
  33         if (iov_iter_rw(iter) == READ) {
  34 @@ -248,12 +248,13 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,
  35                 put_page(bvec->bv_page);
  36         }
  37
  38 -       if (vecs != inline_vecs)
  39 -               kfree(vecs);
  40 -
  41         if (unlikely(bio.bi_status))
  42                 ret = blk_status_to_errno(bio.bi_status);
  43
  44 +out:
  45 +       if (vecs != inline_vecs)
  46 +               kfree(vecs);
  47 +
  48         bio_uninit(&bio);
  49
  50         return ret;