lkml.org 
[lkml]   [2012]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 16/32] vfs: make chroot retry once on ESTALE error
    Date
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    ---
    fs/open.c | 37 +++++++++++++++++++++----------------
    1 file changed, 21 insertions(+), 16 deletions(-)

    diff --git a/fs/open.c b/fs/open.c
    index 5c2a973..a1331f1 100644
    --- a/fs/open.c
    +++ b/fs/open.c
    @@ -434,27 +434,32 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
    {
    struct path path;
    int error;
    + int lookup_flags = LOOKUP_FOLLOW | LOOKUP_DIRECTORY;
    + unsigned int try = 0;

    - error = user_path_dir(filename, &path);
    - if (error)
    - goto out;
    + do {
    + error = user_path_at(AT_FDCWD, filename, lookup_flags, &path);
    + if (error)
    + break;

    - error = inode_permission(path.dentry->d_inode, MAY_EXEC | MAY_CHDIR);
    - if (error)
    - goto dput_and_out;
    + error = inode_permission(path.dentry->d_inode,
    + MAY_EXEC | MAY_CHDIR);
    + if (error)
    + goto dput_and_out;

    - error = -EPERM;
    - if (!capable(CAP_SYS_CHROOT))
    - goto dput_and_out;
    - error = security_path_chroot(&path);
    - if (error)
    - goto dput_and_out;
    + error = -EPERM;
    + if (!capable(CAP_SYS_CHROOT))
    + goto dput_and_out;
    + error = security_path_chroot(&path);
    + if (error)
    + goto dput_and_out;

    - set_fs_root(current->fs, &path);
    - error = 0;
    + set_fs_root(current->fs, &path);
    + error = 0;
    dput_and_out:
    - path_put(&path);
    -out:
    + path_put(&path);
    + lookup_flags |= LOOKUP_REVAL;
    + } while (retry_estale(error, try++));
    return error;
    }

    --
    1.7.11.7


    \
     
     \ /
      Last update: 2012-10-27 15:21    [W:4.349 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site