diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2016-03-02 16:36:21 -0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-04-18 08:49:33 -0400 |
| commit | 652181312ec344432085373c90d46d129a7b51ef (patch) | |
| tree | b562f278bd81898fd44c2285d759d64294b61eba | |
| parent | 53b7c0ed67fecfb2123a14b4d1ae246fb2807283 (diff) | |
| download | lwn-652181312ec344432085373c90d46d129a7b51ef.tar.gz lwn-652181312ec344432085373c90d46d129a7b51ef.zip | |
nfsd: fix deadlock secinfo+readdir compound
[ Upstream commit 2f6fc056e899bd0144a08da5cacaecbe8997cd74 ]
nfsd_lookup_dentry exits with the parent filehandle locked. fh_put also
unlocks if necessary (nfsd filehandle locking is probably too lenient),
so it gets unlocked eventually, but if the following op in the compound
needs to lock it again, we can deadlock.
A fuzzer ran into this; normal clients don't send a secinfo followed by
a readdir in the same compound.
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 6ed585935d5e..606d5aa33d76 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -878,6 +878,7 @@ nfsd4_secinfo(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, &exp, &dentry); if (err) return err; + fh_unlock(&cstate->current_fh); if (dentry->d_inode == NULL) { exp_put(exp); err = nfserr_noent; |