Commit ce779d6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse 

Pull fuse fix from Miklos Szeredi:
 "Fix a regression spotted by Jeff Layton"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix clearing suid, sgid for chown()
parents f27c2f69 c01638f5

fs/fuse/dir.c

+2 −5
Original line number Diff line number Diff line
@@ -1739,8 +1739,6 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr) 
		 * This should be done on write(), truncate() and chown().

		 */

		if (!fc->handle_killpriv) {

			int kill;



			/*

			 * ia_mode calculation may have used stale i_mode.

			 * Refresh and recalculate.
@@ -1750,12 +1748,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;

			}