lkml.org 
[lkml]   [2021]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 001/168] io_uring: ensure symmetry in handling iter types in loop_rw_iter()
    Date
    From: Jens Axboe <axboe@kernel.dk>

    commit 16c8d2df7ec0eed31b7d3b61cb13206a7fb930cc upstream.

    When setting up the next segment, we check what type the iter is and
    handle it accordingly. However, when incrementing and processed amount
    we do not, and both iter advance and addr/len are adjusted, regardless
    of type. Split the increment side just like we do on the setup side.

    Fixes: 4017eb91a9e7 ("io_uring: make loop_rw_iter() use original user supplied pointers")
    Cc: stable@vger.kernel.org
    Reported-by: Valentina Palmiotti <vpalmiotti@gmail.com>
    Reviewed-by: Pavel Begunkov <asml.silence@gmail.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/io_uring.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    --- a/fs/io_uring.c
    +++ b/fs/io_uring.c
    @@ -3107,12 +3107,15 @@ static ssize_t loop_rw_iter(int rw, stru
    ret = nr;
    break;
    }
    + if (!iov_iter_is_bvec(iter)) {
    + iov_iter_advance(iter, nr);
    + } else {
    + req->rw.len -= nr;
    + req->rw.addr += nr;
    + }
    ret += nr;
    if (nr != iovec.iov_len)
    break;
    - req->rw.len -= nr;
    - req->rw.addr += nr;
    - iov_iter_advance(iter, nr);
    }

    return ret;

    \
     
     \ /
      Last update: 2021-09-20 21:07    [W:4.116 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site