aboutsummaryrefslogtreecommitdiff
path: root/sys/fs/nfsserver/nfs_nfsdstate.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/fs/nfsserver/nfs_nfsdstate.c')
-rw-r--r--sys/fs/nfsserver/nfs_nfsdstate.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c
index 111b0f26d0b5..3fae2be5af46 100644
--- a/sys/fs/nfsserver/nfs_nfsdstate.c
+++ b/sys/fs/nfsserver/nfs_nfsdstate.c
@@ -1977,6 +1977,20 @@ tryagain:
error = NFSERR_BADSTATEID;
}
+ /*
+ * Sanity check the stateid for the Lock/LockU cases.
+ */
+ if (error == 0 && (new_stp->ls_flags & NFSLCK_LOCK) != 0 &&
+ (((new_stp->ls_flags & NFSLCK_OPENTOLOCK) != 0 &&
+ (stp->ls_flags & NFSLCK_OPEN) == 0) ||
+ ((new_stp->ls_flags & NFSLCK_OPENTOLOCK) == 0 &&
+ (stp->ls_flags & NFSLCK_LOCK) == 0)))
+ error = NFSERR_BADSTATEID;
+ if (error == 0 && (new_stp->ls_flags & NFSLCK_UNLOCK) != 0 &&
+ (stp->ls_flags & NFSLCK_LOCK) == 0)
+ error = NFSERR_BADSTATEID;
+
+ /* Sanity check the delegation stateid. */
if (error == 0 &&
(stp->ls_flags & (NFSLCK_DELEGREAD | NFSLCK_DELEGWRITE)) &&
getlckret == 0 && stp->ls_lfp != lfp)