Skip to content
Permalink
Browse files

tmpfs: clear S_ISGID when setting posix ACLs

This change was missed the tmpfs modification in In CVE-2016-7097
commit 0739310 ("posix_acl: Clear SGID bit when setting
file permissions")
It can test by xfstest generic/375, which failed to clear
setgid bit in the following test case on tmpfs:

  touch $testfile
  chown 100:100 $testfile
  chmod 2755 $testfile
  _runas -u 100 -g 101 -- setfacl -m u::rwx,g::rwx,o::rwx $testfile

Signed-off-by: Gu Zheng <guzheng1@huawei.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information...
Gu Zheng Al Viro
Gu Zheng authored and Al Viro committed Jan 9, 2017
1 parent b4b8664 commit 497de07d89c1410d76a15bec2bb41f24a2a89f31
Showing with 4 additions and 5 deletions.
  1. +4 −5 fs/posix_acl.c
@@ -922,11 +922,10 @@ int simple_set_acl(struct inode *inode, struct posix_acl *acl, int type)
int error;

if (type == ACL_TYPE_ACCESS) {
error = posix_acl_equiv_mode(acl, &inode->i_mode);
if (error < 0)
return 0;
if (error == 0)
acl = NULL;
error = posix_acl_update_mode(inode,
&inode->i_mode, &acl);
if (error)
return error;
}

inode->i_ctime = current_time(inode);

0 comments on commit 497de07

Please sign in to comment.
You can’t perform that action at this time.