Commit bd9474d2 authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Luis Henriques

NFSv4: Fix a dentry leak on alias use

commit d9dfd8d7 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: default avatarBenjamin Coddington <bcodding@redhat.com>
Fixes: 275bb307 ("NFSv4: Move dentry instantiation into the NFSv4-...")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent c3f8309b
...@@ -2243,9 +2243,9 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, ...@@ -2243,9 +2243,9 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
dentry = d_add_unique(dentry, igrab(state->inode)); dentry = d_add_unique(dentry, igrab(state->inode));
if (dentry == NULL) { if (dentry == NULL) {
dentry = opendata->dentry; dentry = opendata->dentry;
} else if (dentry != ctx->dentry) { } else {
dput(ctx->dentry); dput(ctx->dentry);
ctx->dentry = dget(dentry); ctx->dentry = dentry;
} }
nfs_set_verifier(dentry, nfs_set_verifier(dentry,
nfs_save_change_attribute(opendata->dir->d_inode)); nfs_save_change_attribute(opendata->dir->d_inode));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment