From: J. Bruce Fields <bfields@redhat.com>
Date: Thu, 16 Dec 2010 14:57:15 +0000 (-0500)
Subject: nfsd4: 4.1 SECINFO should consume filehandle
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=56560b9ae0c2d07bb5bbcec16f799d7bf756d3de;p=linux-beck.git

nfsd4: 4.1 SECINFO should consume filehandle

See the referenced spec language; an attempt by a 4.1 client to use the
current filehandle after a secinfo call should result in a NOFILEHANDLE
error.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 0cdfd022bb7b..bad4bf8e4bbc 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -769,6 +769,9 @@ nfsd4_secinfo(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 	} else
 		secinfo->si_exp = exp;
 	dput(dentry);
+	if (cstate->minorversion)
+		/* See rfc 5661 section 2.6.3.1.1.8 */
+		fh_put(&cstate->current_fh);
 	return err;
 }