Attachment 147262 Details for Bug 227188 – patch to mask off high order mode bits in setattr calls

[patch] patch to mask off high order mode bits in setattr calls

nfs-valid-mode-bits.patch (text/plain), 1.61 KB, created by Jeff Layton on 2007-02-03 00:15:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-02-03 00:15:25 UTC

Size: 1.61 KB

patch

obsolete

>commit cf3fff54a46e1f8fa4cc1deb783172a392077eb0
>Author: Trond Myklebust <Trond.Myklebust@netapp.com>
>Date:   Tue Jan 3 09:55:53 2006 +0100
>
>    NFS: Send valid mode bits to the server
>    
>     inode->i_mode contains a lot more than just the mode bits. Make sure that
>     we mask away this extra stuff in SETATTR calls to the server.
>    
>     Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
>
>diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
>index 0498bd3..b6c0b50 100644
>--- a/fs/nfs/nfs3xdr.c
>+++ b/fs/nfs/nfs3xdr.c
>@@ -182,7 +182,7 @@ xdr_encode_sattr(u32 *p, struct iattr *attr)
> {
> 	if (attr->ia_valid & ATTR_MODE) {
> 		*p++ = xdr_one;
>-		*p++ = htonl(attr->ia_mode);
>+		*p++ = htonl(attr->ia_mode & S_IALLUGO);
> 	} else {
> 		*p++ = xdr_zero;
> 	}
>diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
>index 12be1d6..4bbf5ef 100644
>--- a/fs/nfs/nfs4xdr.c
>+++ b/fs/nfs/nfs4xdr.c
>@@ -566,7 +566,7 @@ static int encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const s
> 	}
> 	if (iap->ia_valid & ATTR_MODE) {
> 		bmval1 |= FATTR4_WORD1_MODE;
>-		WRITE32(iap->ia_mode);
>+		WRITE32(iap->ia_mode & S_IALLUGO);
> 	}
> 	if (iap->ia_valid & ATTR_UID) {
> 		bmval1 |= FATTR4_WORD1_OWNER;
>diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
>index 6145e82..f5150d7 100644
>--- a/fs/nfs/proc.c
>+++ b/fs/nfs/proc.c
>@@ -111,6 +111,9 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
> 	};
> 	int	status;
> 
>+	/* Mask out the non-modebit related stuff from attr->ia_mode */
>+	sattr->ia_mode &= S_IALLUGO;
>+
> 	dprintk("NFS call  setattr\n");
> 	nfs_fattr_init(fattr);
> 	status = rpc_call(NFS_CLIENT(inode), NFSPROC_SETATTR, &arg, fattr, 0);

Actions: View | Diff

Attachments on bug 227188: 147262