diff options
authorRick Macklem <rmacklem@FreeBSD.org>2020-09-29 15:09:38 +0000
committerRick Macklem <rmacklem@FreeBSD.org>2020-09-29 15:09:38 +0000
commit65dd5ed99b91891da459d7d2267cb00245bc7ff7 (patch)
parentf614d5fcd6f00605835dd299b07716dfe542368b (diff)
MFS: r366238
Bjorn reported a problem where the Linux NFSv4.1 client is using an open_to_lock_owner4 when that lock_owner4 has already been created by a previous open_to_lock_owner4. This caused the NFS server to reply NFSERR_INVAL. For NFSv4.0, this is an error, although the updated NFSv4.0 RFC7530 notes that the correct error reply is NFSERR_BADSEQID (RFC3530 did not specify what error to return). For NFSv4.1, it is not obvious whether or not this is allowed by RFC5661, but the NFSv4.1 server can handle this case without error. This patch changes the NFSv4.1 (and NFSv4.2) server to handle multiple uses of the same lock_owner in open_to_lock_owner so that it now correctly interoperates with the Linux NFS client. It also changes the error returned for NFSv4.0 to be NFSERR_BADSEQID. Thanks go to Bjorn for diagnosing this and testing the patch. He also provided a program that I could use to reproduce the problem. PR: 249567 Approved by: re (gjb)
Notes: svn path=/releng/12.2/; revision=366256
1 files changed, 12 insertions, 6 deletions
diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c
index 58b83c7a5fb5..5b92e7c297fa 100644
--- a/sys/fs/nfsserver/nfs_nfsdstate.c
+++ b/sys/fs/nfsserver/nfs_nfsdstate.c
@@ -1871,14 +1871,20 @@ tryagain:
if (!error)
nfsrv_getowner(&stp->ls_open, new_stp, &lckstp);
- if (lckstp)
+ if (lckstp) {
- * I believe this should be an error, but it
- * isn't obvious what NFSERR_xxx would be
- * appropriate, so I'll use NFSERR_INVAL for now.
+ * For NFSv4.1 and NFSv4.2 allow an
+ * open_to_lock_owner when the lock_owner already
+ * exists. Just clear NFSLCK_OPENTOLOCK so that
+ * a new lock_owner will not be created.
+ * RFC7530 states that the error for NFSv4.0
- error = NFSERR_INVAL;
- else
+ if ((nd->nd_flag & ND_NFSV41) != 0)
+ new_stp->ls_flags &= ~NFSLCK_OPENTOLOCK;
+ else
+ } else
lckstp = new_stp;
} else if (new_stp->ls_flags&(NFSLCK_LOCK|NFSLCK_UNLOCK)) {