]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
nfsd: fix deadlock secinfo+readdir compound
authorJ. Bruce Fields <bfields@redhat.com>
Thu, 3 Mar 2016 00:36:21 +0000 (16:36 -0800)
committerSasha Levin <sasha.levin@oracle.com>
Mon, 18 Apr 2016 12:51:00 +0000 (08:51 -0400)
commit03d44e3d9dd7744fe97ca472fce1725b7179fa2f
treea529f004c219d4f1da54ba22d50be271d605cd91
parent4fa1657957f668fcc9606268df01bc0f3e4f1379
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>
fs/nfsd/nfs4proc.c