diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2016-03-02 16:36:21 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-05-01 00:06:00 +0200 |
| commit | a34207e99ce196675d059f1b01baa50850fe7832 (patch) | |
| tree | 3c11895746724f6c7db666ffce36dff5f13de875 /fs/nfsd | |
| parent | 738b5be454943dadefffb668cc89255e3e72ab1d (diff) | |
| download | linux-stable-a34207e99ce196675d059f1b01baa50850fe7832.tar.gz linux-stable-a34207e99ce196675d059f1b01baa50850fe7832.tar.bz2 linux-stable-a34207e99ce196675d059f1b01baa50850fe7832.zip | |
nfsd: fix deadlock secinfo+readdir compound
commit 2f6fc056e899bd0144a08da5cacaecbe8997cd74 upstream.
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.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/nfsd')
| -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 5d3031ecb1df..5432605cce7d 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -880,6 +880,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; |