nfsd: don't return an unhashed lock stateid after taking mutex
authorJeff Layton <jlayton@redhat.com>
Thu, 11 Aug 2016 14:37:39 +0000 (10:37 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 20 Aug 2016 16:09:21 +0000 (18:09 +0200)
commit37cbe5b6d12580c6bb189dc3be418b681ce7d5a1
treebdc2ed3e2b2063c01d42d0f866f51e742fc2fed6
parent6dfc20babd386b8990c9ad99fa9e3afe875cba1f
nfsd: don't return an unhashed lock stateid after taking mutex

commit dd257933fa4b9fea66a1195f8a15111029810abc upstream.

nfsd4_lock will take the st_mutex before working with the stateid it
gets, but between the time when we drop the cl_lock and take the mutex,
the stateid could become unhashed (a'la FREE_STATEID). If that happens
the lock stateid returned to the client will be forgotten.

Fix this by first moving the st_mutex acquisition into
lookup_or_create_lock_state. Then, have it check to see if the lock
stateid is still hashed after taking the mutex. If it's not, then put
the stateid and try the find/create again.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Tested-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfsd/nfs4state.c