lkml.org 
[lkml]   [2016]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 08/70] nfs: use file_dentry()
    Date
    4.2.8-ckt8 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Miklos Szeredi <mszeredi@redhat.com>

    commit be62a1a8fd116f5cd9e53726601f970e16e17558 upstream.

    NFS may be used as lower layer of overlayfs and accessing f_path.dentry can
    lead to a crash.

    Fix by replacing direct access of file->f_path.dentry with the
    file_dentry() accessor, which will always return a native object.

    Fixes: 4bacc9c9234c ("overlayfs: Make f_path always point to the overlay and f_inode to the underlay")
    Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
    Tested-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
    Acked-by: Trond Myklebust <trond.myklebust@primarydata.com>
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Cc: David Howells <dhowells@redhat.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/nfs/dir.c | 6 +++---
    fs/nfs/inode.c | 2 +-
    fs/nfs/nfs4file.c | 4 ++--
    3 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
    index fccbda7..d07330e 100644
    --- a/fs/nfs/dir.c
    +++ b/fs/nfs/dir.c
    @@ -377,7 +377,7 @@ int nfs_readdir_xdr_filler(struct page **pages, nfs_readdir_descriptor_t *desc,
    again:
    timestamp = jiffies;
    gencount = nfs_inc_attr_generation_counter();
    - error = NFS_PROTO(inode)->readdir(file->f_path.dentry, cred, entry->cookie, pages,
    + error = NFS_PROTO(inode)->readdir(file_dentry(file), cred, entry->cookie, pages,
    NFS_SERVER(inode)->dtsize, desc->plus);
    if (error < 0) {
    /* We requested READDIRPLUS, but the server doesn't grok it */
    @@ -560,7 +560,7 @@ int nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct nfs_entry *en
    count++;

    if (desc->plus != 0)
    - nfs_prime_dcache(desc->file->f_path.dentry, entry);
    + nfs_prime_dcache(file_dentry(desc->file), entry);

    status = nfs_readdir_add_to_array(entry, page);
    if (status != 0)
    @@ -872,7 +872,7 @@ static bool nfs_dir_mapping_need_revalidate(struct inode *dir)
    */
    static int nfs_readdir(struct file *file, struct dir_context *ctx)
    {
    - struct dentry *dentry = file->f_path.dentry;
    + struct dentry *dentry = file_dentry(file);
    struct inode *inode = d_inode(dentry);
    nfs_readdir_descriptor_t my_desc,
    *desc = &my_desc;
    diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
    index 7bf2c65..67fb406 100644
    --- a/fs/nfs/inode.c
    +++ b/fs/nfs/inode.c
    @@ -910,7 +910,7 @@ int nfs_open(struct inode *inode, struct file *filp)
    {
    struct nfs_open_context *ctx;

    - ctx = alloc_nfs_open_context(filp->f_path.dentry, filp->f_mode);
    + ctx = alloc_nfs_open_context(file_dentry(filp), filp->f_mode);
    if (IS_ERR(ctx))
    return PTR_ERR(ctx);
    nfs_file_set_open_context(filp, ctx);
    diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
    index dcd39d4..2599124 100644
    --- a/fs/nfs/nfs4file.c
    +++ b/fs/nfs/nfs4file.c
    @@ -22,7 +22,7 @@ static int
    nfs4_file_open(struct inode *inode, struct file *filp)
    {
    struct nfs_open_context *ctx;
    - struct dentry *dentry = filp->f_path.dentry;
    + struct dentry *dentry = file_dentry(filp);
    struct dentry *parent = NULL;
    struct inode *dir;
    unsigned openflags = filp->f_flags;
    @@ -54,7 +54,7 @@ nfs4_file_open(struct inode *inode, struct file *filp)
    parent = dget_parent(dentry);
    dir = d_inode(parent);

    - ctx = alloc_nfs_open_context(filp->f_path.dentry, filp->f_mode);
    + ctx = alloc_nfs_open_context(file_dentry(filp), filp->f_mode);
    err = PTR_ERR(ctx);
    if (IS_ERR(ctx))
    goto out;
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-04-13 00:01    [W:2.063 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site