The patch titled
     CIFS: ignore mode change if it's just for clearing setuid/setgid bits
has been removed from the -mm tree.  Its filename was
     cifs-ignore-mode-change-if-its-just-for-clearing-setuid-setgid-bits.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: CIFS: ignore mode change if it's just for clearing setuid/setgid bits
From: Jeff Layton <[EMAIL PROTECTED]>

If the ATTR_KILL_S*ID bits are set then any mode change is only for clearing
the setuid/setgid bits.  For CIFS, skip the mode change and let the server
handle it.

Signed-off-by: Jeff Layton <[EMAIL PROTECTED]>
Cc: Steven French <[EMAIL PROTECTED]>
Cc: Christoph Hellwig <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 fs/cifs/inode.c |    5 +++++
 1 file changed, 5 insertions(+)

diff -puN 
fs/cifs/inode.c~cifs-ignore-mode-change-if-its-just-for-clearing-setuid-setgid-bits
 fs/cifs/inode.c
--- 
a/fs/cifs/inode.c~cifs-ignore-mode-change-if-its-just-for-clearing-setuid-setgid-bits
+++ a/fs/cifs/inode.c
@@ -1538,6 +1538,11 @@ int cifs_setattr(struct dentry *direntry
        }
 
        time_buf.Attributes = 0;
+
+       /* skip mode change if it's just for clearing setuid/setgid */
+       if (attrs->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID))
+               attrs->ia_valid &= ~ATTR_MODE;
+
        if (attrs->ia_valid & ATTR_MODE) {
                cFYI(1, ("Mode changed to 0x%x", attrs->ia_mode));
                mode = attrs->ia_mode;
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
git-cifs.patch
unionfs-fix-unionfs_setattr-to-handle-attr_kill_sid.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to