lkml.org 
[lkml]   [2012]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 124/180] fuse: verify all ioctl retry iov elements
    2.6.32-longterm review patch.  If anyone has any objections, please let me know.

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

    From: Zach Brown <zab@redhat.com>

    commit fb6ccff667712c46b4501b920ea73a326e49626a upstream.

    Commit 7572777eef78ebdee1ecb7c258c0ef94d35bad16 attempted to verify that
    the total iovec from the client doesn't overflow iov_length() but it
    only checked the first element. The iovec could still overflow by
    starting with a small element. The obvious fix is to check all the
    elements.

    The overflow case doesn't look dangerous to the kernel as the copy is
    limited by the length after the overflow. This fix restores the
    intention of returning an error instead of successfully copying less
    than the iovec represented.

    I found this by code inspection. I built it but don't have a test case.
    I'm cc:ing stable because the initial commit did as well.

    Signed-off-by: Zach Brown <zab@redhat.com>
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    fs/fuse/file.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/fs/fuse/file.c b/fs/fuse/file.c
    index f6104a95..102d582 100644
    --- a/fs/fuse/file.c
    +++ b/fs/fuse/file.c
    @@ -1664,7 +1664,7 @@ static int fuse_verify_ioctl_iov(struct iovec *iov, size_t count)
    size_t n;
    u32 max = FUSE_MAX_PAGES_PER_REQ << PAGE_SHIFT;

    - for (n = 0; n < count; n++) {
    + for (n = 0; n < count; n++, iov++) {
    if (iov->iov_len > (size_t) max)
    return -ENOMEM;
    max -= iov->iov_len;
    --
    1.7.2.1.45.g54fbc




    \
     
     \ /
      Last update: 2012-10-02 10:41    [W:8.699 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site