nfsd4: warn on finding lockowner without stateid's
authorJ. Bruce Fields <bfields@redhat.com>
Thu, 8 May 2014 15:19:41 +0000 (11:19 -0400)
committerJiri Slaby <jslaby@suse.cz>
Mon, 9 Jun 2014 13:53:34 +0000 (15:53 +0200)
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: Jiri Slaby <jslaby@suse.cz>
fs/nfsd/nfs4state.c

index b21ed5e5b369a124a88d5b6f745c5037271919bc..6f1250c14606c0bb4cc0c29e7386412518cb18bf 100644 (file)
@@ -4142,6 +4142,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;