nfsd: fix deadlock secinfo+readdir compound
authorJ. Bruce Fields <bfields@redhat.com>
Thu, 3 Mar 2016 00:36:21 +0000 (16:36 -0800)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 30 Apr 2016 22:05:18 +0000 (00:05 +0200)
commit2ec876e355fe6cefc340178e82f5dfd17306adcf
tree0c8bab6238430289ff95c613a29613f7f3280e9e
parentc0e9921c951610c287650bf70495d7ccac8bee7f
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.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/nfsd/nfs4proc.c