diff options
| author | Jeff Layton <jlayton@redhat.com> | 2007-10-18 12:05:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 23:37:22 +0200 |
| commit | d32c4f2626acc385d5187bd5c0c24f442328dc60 (patch) | |
| tree | cd08c94dcf8610c2c2cfc96e5abe744163f3a038 | |
| parent | NFS: if ATTR_KILL_S*ID bits are set, then skip mode change (diff) | |
| download | linux-d32c4f2626acc385d5187bd5c0c24f442328dc60.tar.xz linux-d32c4f2626acc385d5187bd5c0c24f442328dc60.zip | |
CIFS: ignore mode change if it's just for clearing setuid/setgid bits
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 <jlayton@redhat.com>
Cc: Steven French <sfrench@us.ibm.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/cifs/inode.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index dd4167762a8e..279f3c5e0ce3 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -1538,6 +1538,11 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) } 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; |