From: J. Bruce Fields Date: Tue, 17 Jul 2007 11:04:52 +0000 (-0700) Subject: knfsd: nfsd: allow auth_sys nlm on rpcsec_gss exports X-Git-Tag: v2.6.23-rc1~636 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9091224f3cff4721f295df29e8a99705a63bc4c7;p=linux-2.6-omap-h63xx.git knfsd: nfsd: allow auth_sys nlm on rpcsec_gss exports Our clients (like other clients, as far as I know) use only auth_sys for nlm, even when using rpcsec_gss for the main nfs operations. Administrators that want to deny non-kerberos-authenticated locking requests will need to turn off NFS protocol versions less than 4.... Signed-off-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 8d2b4991484..0eb464a39aa 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -249,10 +249,16 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) if (error) goto out; - /* Check security flavor */ - error = check_nfsd_access(exp, rqstp); - if (error) - goto out; + if (!(access & MAY_LOCK)) { + /* + * pseudoflavor restrictions are not enforced on NLM, + * which clients virtually always use auth_sys for, + * even while using RPCSEC_GSS for NFS. + */ + error = check_nfsd_access(exp, rqstp); + if (error) + goto out; + } /* Finally, check access permissions. */ error = nfsd_permission(rqstp, exp, dentry, access);