Commit 6e14b46b authored by Albert Fluegel's avatar Albert Fluegel Committed by J. Bruce Fields
Browse files

nfsd: don't return high mode bits 



The Linux NFS server replies among other things to a "Check access permission"
the following:

NFS:    File type = 2 (Directory)
NFS:    Mode = 040755

A netapp server replies here:
NFS:    File type = 2 (Directory)
NFS:    Mode = 0755

The RFC 1813 i read:
   fattr3

      struct fattr3 {
         ftype3     type;
         mode3      mode;
         uint32     nlink;
...
For the mode bits only the lowest 9 are defined in the RFC

As far as I can tell, knfsd has always done this, so apparently it's harmless.
Nevertheless, it appears to be wrong.

Note this is already correct in the NFSv4 case, only v2 and v3 need
fixing.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 4bd8eabc

fs/nfsd/nfs3xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ encode_fattr3(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp, 
	      struct kstat *stat)

{

	*p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]);

	*p++ = htonl((u32) stat->mode);

	*p++ = htonl((u32) (stat->mode & S_IALLUGO));

	*p++ = htonl((u32) stat->nlink);

	*p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid));

	*p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid));

fs/nfsd/nfsxdr.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp, 
	type = (stat->mode & S_IFMT);



	*p++ = htonl(nfs_ftypes[type >> 12]);

	*p++ = htonl((u32) stat->mode);

	*p++ = htonl((u32) (stat->mode & S_IALLUGO));

	*p++ = htonl((u32) stat->nlink);

	*p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid));

	*p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid));

CRA Git | Maintained and supported by SUSTech CRA and CCSE