fuse: fix clearing suid, sgid for chown()

[pandora-kernel.git] / fs / fuse / dir.c

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 4041f76..d0f57b1 100644 (file)
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1398,8 +1398,6 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
        int ret;
 
        if (attr->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID)) {
-               int kill;
-
                attr->ia_valid &= ~(ATTR_KILL_SUID | ATTR_KILL_SGID |
                                    ATTR_MODE);
                /*
@@ -1411,12 +1409,11 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
                        return ret;
 
                attr->ia_mode = inode->i_mode;
-               kill = should_remove_suid(entry);
-               if (kill & ATTR_KILL_SUID) {
+               if (inode->i_mode & S_ISUID) {
                        attr->ia_valid |= ATTR_MODE;
                        attr->ia_mode &= ~S_ISUID;
                }
-               if (kill & ATTR_KILL_SGID) {
+               if ((inode->i_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
                        attr->ia_valid |= ATTR_MODE;
                        attr->ia_mode &= ~S_ISGID;
                }