---

yaml --- r: 71141 b: refs/heads/master c: 188b95d h: refs/heads/master i: 71139: 3ac9fe0 v: v3
git-mirror · Oct 18, 2007 · c07668d · c07668d
1 parent f20000d
commit c07668d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6de0ec00ba8db84d7c452e65e502989455ecb6ea
+refs/heads/master: 188b95dd8ecb02dd6c6e5534cddc5a89aa4e2852
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
@@ -357,6 +357,10 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
 
 	nfs_inc_stats(inode, NFSIOS_VFSSETATTR);
 
+	/* skip mode change if it's just for clearing setuid/setgid */
+	if (attr->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID))
+		attr->ia_valid &= ~ATTR_MODE;
+
 	if (attr->ia_valid & ATTR_SIZE) {
 		if (!S_ISREG(inode->i_mode) || attr->ia_size == i_size_read(inode))
 			attr->ia_valid &= ~ATTR_SIZE;