1 files changed, 8 insertions, 0 deletions

diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 5701f816faf4..0b1ab016fa2e 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -914,6 +914,14 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia)
                 if (rc < 0)
                         goto out;
         }
+
+        /*
+         * mode change is for clearing setuid/setgid bits. Allow lower fs
+         * to interpret this in its own way.
+         */
+        if (ia->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID))
+                ia->ia_valid &= ~ATTR_MODE;
+
         rc = notify_change(lower_dentry, ia);
 out:
         fsstack_copy_attr_all(inode, lower_inode, NULL);