linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@redhat.com>
To: linux-nfs@vger.kernel.org
Cc: "J. Bruce Fields" <bfields@redhat.com>
Subject: [PATCH 04/11] nfsd4: allow an EXCHANGE_ID to kill a 4.0 client
Date: Wed, 16 May 2012 08:48:32 -0400	[thread overview]
Message-ID: <1337172519-17335-5-git-send-email-bfields@redhat.com> (raw)
In-Reply-To: <1337172519-17335-1-git-send-email-bfields@redhat.com>

From: "J. Bruce Fields" <bfields@redhat.com>

Following rfc 5661 section 2.4.1, we can permit a 4.1 client to remove
an established 4.0 client's state.

(But we don't allow updates.)

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
 fs/nfsd/nfs4state.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 9d77181..76459a7 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1516,8 +1516,10 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
 	conf = find_confirmed_client_by_str(dname, strhashval);
 	if (conf) {
 		if (!clp_used_exchangeid(conf)) {
-			status = nfserr_clid_inuse; /* XXX: ? */
-			goto out;
+			if (exid->flags & EXCHGID4_FLAG_UPD_CONFIRMED_REC_A) {
+				status = nfserr_inval; /* buggy client */
+				goto out;
+			}
 		}
 		if (!same_creds(&conf->cl_cred, &rqstp->rq_cred)) {
 			/* 18.35.4 case 9 */
@@ -1537,6 +1539,10 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
 			expire_client(conf);
 			goto out_new;
 		}
+		if (!clp_used_exchangeid(conf)) {
+			status = nfserr_inval;
+			goto out;
+		}
 		/*
 		 * Set bit when the owner id and verifier map to an already
 		 * confirmed client id (18.35.3).
-- 
1.7.9.5


  parent reply	other threads:[~2012-05-16 12:48 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-16 12:48 exchange_id changes for 3.5 J. Bruce Fields
2012-05-16 12:48 ` [PATCH 01/11] nfsd4: exchange_id has a pointless copy J. Bruce Fields
2012-05-16 12:48 ` [PATCH 02/11] nfsd4: exchange_id error cleanup J. Bruce Fields
2012-05-16 12:48 ` [PATCH 03/11] nfsd4: exchange_id: check creds before killing confirmed client J. Bruce Fields
2012-05-16 12:48 ` J. Bruce Fields [this message]
2012-05-16 12:48 ` [PATCH 05/11] nfsd4: exchange_id cleanup: local shorthands for repeated tests J. Bruce Fields
2012-05-16 12:48 ` [PATCH 06/11] nfsd4: exchange_id cleanup: comments J. Bruce Fields
2012-05-16 12:48 ` [PATCH 07/11] nfsd4: rearrange exchange_id logic to simplify J. Bruce Fields
2012-05-16 12:48 ` [PATCH 08/11] nfsd4: allow removing clients not holding state J. Bruce Fields
2012-05-16 12:48 ` [PATCH 09/11] nfsd4: move principal name into svc_cred J. Bruce Fields
2012-05-16 12:48 ` [PATCH 10/11] nfsd4: stricter cred comparison for setclientid/exchange_id J. Bruce Fields
2012-05-16 12:48 ` [PATCH 11/11] nfsd4: move rq_flavor into svc_cred J. Bruce Fields

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1337172519-17335-5-git-send-email-bfields@redhat.com \
    --to=bfields@redhat.com \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).