lkml.org 
[lkml]   [2013]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 53/78] btrfs: don't stop searching after encountering the wrong item
    Date
    3.8.13.1 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Gabriel de Perthuis <g2p.code@gmail.com>

    commit 03b71c6ca6286625d8f1ed44aabab9b5bf5dac10 upstream.

    The search ioctl skips items that are too large for a result buffer, but
    inline items of a certain size occuring before any search result is
    found would trigger an overflow and stop the search entirely.

    Bug: https://bugzilla.kernel.org/show_bug.cgi?id=57641

    Signed-off-by: Gabriel de Perthuis <g2p.code+btrfs@gmail.com>
    Signed-off-by: Josef Bacik <jbacik@fusionio.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/btrfs/ioctl.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
    index 338f259..47d5dcd 100644
    --- a/fs/btrfs/ioctl.c
    +++ b/fs/btrfs/ioctl.c
    @@ -1767,7 +1767,11 @@ static noinline int copy_to_sk(struct btrfs_root *root,
    item_off = btrfs_item_ptr_offset(leaf, i);
    item_len = btrfs_item_size_nr(leaf, i);

    - if (item_len > BTRFS_SEARCH_ARGS_BUFSIZE)
    + btrfs_item_key_to_cpu(leaf, key, i);
    + if (!key_in_sk(key, sk))
    + continue;
    +
    + if (sizeof(sh) + item_len > BTRFS_SEARCH_ARGS_BUFSIZE)
    item_len = 0;

    if (sizeof(sh) + item_len + *sk_offset >
    @@ -1776,10 +1780,6 @@ static noinline int copy_to_sk(struct btrfs_root *root,
    goto overflow;
    }

    - btrfs_item_key_to_cpu(leaf, key, i);
    - if (!key_in_sk(key, sk))
    - continue;
    -
    sh.objectid = key->objectid;
    sh.offset = key->offset;
    sh.type = key->type;
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-05-29 00:01    [W:2.596 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site