From: J. Bruce Fields Date: Thu, 3 Mar 2016 00:36:21 +0000 (-0800) Subject: nfsd: fix deadlock secinfo+readdir compound X-Git-Tag: v4.1.12-92~150^2~41 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b68af51a678c1d7bf4075fff8eefffbac3b39277;p=users%2Fjedix%2Flinux-maple.git nfsd: fix deadlock secinfo+readdir compound Orabug: 23331119 [ 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 Signed-off-by: Sasha Levin (cherry picked from commit 03d44e3d9dd7744fe97ca472fce1725b7179fa2f) Signed-off-by: Dan Duval --- diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 864e2003e8ded..2b50bc0c545e0 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -881,6 +881,7 @@ nfsd4_secinfo(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, &exp, &dentry); if (err) return err; + fh_unlock(&cstate->current_fh); if (d_really_is_negative(dentry)) { exp_put(exp); err = nfserr_noent;