lkml.org 
[lkml]   [2013]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 021/105] reiserfs: fix spurious multiple-fill in reiserfs_readdir_dentry
    Date
    3.8.13.4 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Jeff Mahoney <jeffm@jeffreymahoney.com>

    commit 0bdc7acba56a7ca4232f15f37b16f7ec079385ab upstream.

    After sleeping for filldir(), we check to see if the file system has
    changed and research. The next_pos pointer is updated but its value
    isn't pushed into the key used for the search itself. As a result,
    the search returns the same item that the last cycle of the loop did
    and filldir() is called multiple times with the same data.

    The end result is that the buffer can contain the same name multiple
    times. This can be returned to userspace or used internally in the
    xattr code where it can manifest with the following warning:

    jdm-20004 reiserfs_delete_xattrs: Couldn't delete all xattrs (-2)

    reiserfs_for_each_xattr uses reiserfs_readdir_dentry to iterate over
    the xattr names and ends up trying to unlink the same name twice. The
    second attempt fails with -ENOENT and the error is returned. At some
    point I'll need to add support into reiserfsck to remove the orphaned
    directories left behind when this occurs.

    The fix is to push the value into the key before researching.

    Signed-off-by: Jeff Mahoney <jeffm@suse.com>
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/reiserfs/dir.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
    index 66c53b6..6c2d136 100644
    --- a/fs/reiserfs/dir.c
    +++ b/fs/reiserfs/dir.c
    @@ -204,6 +204,8 @@ int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent,
    next_pos = deh_offset(deh) + 1;

    if (item_moved(&tmp_ih, &path_to_entry)) {
    + set_cpu_key_k_offset(&pos_key,
    + next_pos);
    goto research;
    }
    } /* for */
    --
    1.8.1.2


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