nfsd: Close race between nfsd4_release_lockowner and nfsd4_lock
authorChuck Lever <chuck.lever@oracle.com>
Wed, 13 Jul 2016 20:40:14 +0000 (16:40 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 24 Sep 2016 08:07:36 +0000 (10:07 +0200)
commit1d13f37f6a3940226ff75ac7473b81bbd7ac6d37
tree1221369cf87758ebee156de8fa16eeb062aa8f22
parent35c12ee60b5cd3d4531a36d07ca12c43484c3a19
nfsd: Close race between nfsd4_release_lockowner and nfsd4_lock

commit 885848186fbc2d1d8fb6d2fdc2156638ae289a46 upstream.

nfsd4_release_lockowner finds a lock owner that has no lock state,
and drops cl_lock. Then release_lockowner picks up cl_lock and
unhashes the lock owner.

During the window where cl_lock is dropped, I don't see anything
preventing a concurrent nfsd4_lock from finding that same lock owner
and adding lock state to it.

Move release_lockowner() into nfsd4_release_lockowner and hang onto
the cl_lock until after the lock owner's state cannot be found
again.

Found by inspection, we don't currently have a reproducer.

Fixes: 2c41beb0e5cf ("nfsd: reduce cl_lock thrashing in ... ")
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfsd/nfs4state.c