lkml.org 
[lkml]   [2016]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 098/138] NFSv4: Fix a dentry leak on alias use
    Date
    3.13.11-ckt36 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Benjamin Coddington <bcodding@redhat.com>

    commit d9dfd8d741683347ee159d25f5b50c346a0df557 upstream.

    In the case where d_add_unique() finds an appropriate alias to use it will
    have already incremented the reference count. An additional dget() to swap
    the open context's dentry is unnecessary and will leak a reference.

    Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
    Fixes: 275bb307865a3 ("NFSv4: Move dentry instantiation into the NFSv4-...")
    Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/nfs/nfs4proc.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
    index e2cff31..2962bbc 100644
    --- a/fs/nfs/nfs4proc.c
    +++ b/fs/nfs/nfs4proc.c
    @@ -2184,9 +2184,9 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
    dentry = d_add_unique(dentry, igrab(state->inode));
    if (dentry == NULL) {
    dentry = opendata->dentry;
    - } else if (dentry != ctx->dentry) {
    + } else {
    dput(ctx->dentry);
    - ctx->dentry = dget(dentry);
    + ctx->dentry = dentry;
    }
    nfs_set_verifier(dentry,
    nfs_save_change_attribute(opendata->dir->d_inode));
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-10 01:01    [W:4.531 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site