diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-05-08 11:19:41 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-07 10:28:21 -0700 |
| commit | befdf0a5cec2ca490bca178b1baf2dba1e7ec261 (patch) | |
| tree | 3d9d2ca38a103dbcf8e24e019f6bf129e27d3ed3 /fs | |
| parent | 930cf0edb2938e26799ea000d96b77bbab9cb98e (diff) | |
| download | linux-stable-befdf0a5cec2ca490bca178b1baf2dba1e7ec261.tar.gz linux-stable-befdf0a5cec2ca490bca178b1baf2dba1e7ec261.tar.bz2 linux-stable-befdf0a5cec2ca490bca178b1baf2dba1e7ec261.zip | |
nfsd4: warn on finding lockowner without stateid's
commit 27b11428b7de097c42f205beabb1764f4365443b upstream.
The current code assumes a one-to-one lockowner<->lock stateid
correspondance.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c602603955ce..451abb20f9ee 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4156,6 +4156,10 @@ static bool same_lockowner_ino(struct nfs4_lockowner *lo, struct inode *inode, c if (!same_owner_str(&lo->lo_owner, owner, clid)) return false; + if (list_empty(&lo->lo_owner.so_stateids)) { + WARN_ON_ONCE(1); + return false; + } lst = list_first_entry(&lo->lo_owner.so_stateids, struct nfs4_ol_stateid, st_perstateowner); return lst->st_file->fi_inode == inode; |