nfsd4: allow fh_verify caller to skip pseudoflavor checks

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

nfsd4: allow fh_verify caller to skip pseudoflavor checks
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
J. Bruce Fields
1 parent aea93397db
Showing 2 changed files with 2 additions and 1 deletions Side-by-side Diff
fs/nfsd/nfsfh.c
fs/nfsd/vfs.h
@@ -344,7 +344,7 @@
 	 * which clients virtually always use auth_sys for,
 	 * even while using RPCSEC_GSS for NFS.
 	 */
-	if (access & NFSD_MAY_LOCK)
+	if (access & NFSD_MAY_LOCK || access & NFSD_MAY_BYPASS_GSS)
 		goto skip_pseudoflavor_check;
 	/*
 	 * Clients may expect to be able to use auth_sys during mount,
@@ -24,6 +24,7 @@
 #define NFSD_MAY_LOCAL_ACCESS	128 /* IRIX doing local access check on device special file*/
 #define NFSD_MAY_BYPASS_GSS_ON_ROOT 256
 #define NFSD_MAY_NOT_BREAK_LEASE 512
+#define NFSD_MAY_BYPASS_GSS	1024
  
 #define NFSD_MAY_CREATE		(NFSD_MAY_EXEC|NFSD_MAY_WRITE)
 #define NFSD_MAY_REMOVE		(NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC)
...	...	@@ -344,7 +344,7 @@
344	344	* which clients virtually always use auth_sys for,
345	345	* even while using RPCSEC_GSS for NFS.
346	346	*/
347		- if (access & NFSD_MAY_LOCK)
	347	+ if (access & NFSD_MAY_LOCK \|\| access & NFSD_MAY_BYPASS_GSS)
348	348	goto skip_pseudoflavor_check;
349	349	/*
350	350	* Clients may expect to be able to use auth_sys during mount,
...	...	@@ -24,6 +24,7 @@
24	24	#define NFSD_MAY_LOCAL_ACCESS 128 /* IRIX doing local access check on device special file*/
25	25	#define NFSD_MAY_BYPASS_GSS_ON_ROOT 256
26	26	#define NFSD_MAY_NOT_BREAK_LEASE 512
	27	+#define NFSD_MAY_BYPASS_GSS 1024
27	28
28	29	#define NFSD_MAY_CREATE (NFSD_MAY_EXEC\|NFSD_MAY_WRITE)
29	30	#define NFSD_MAY_REMOVE (NFSD_MAY_EXEC\|NFSD_MAY_WRITE\|NFSD_MAY_TRUNC)