libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix merging group perms into owner perms in owner == group case 

* sec_acl.cc (set_posix_access): Move merging group perms into owner
        perms in case of owner == group after mask has been computed.  Take
        mask into account when doing so to avoid unnecessary ACCESS_DENIED_ACE.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-04-16 22:27:49 +02:00
parent c14215de38
commit e26cf1c5d7
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2015-04-16 Corinna Vinschen <corinna@vinschen.de>
* sec_acl.cc (set_posix_access): Move merging group perms into owner
perms in case of owner == group after mask has been computed. Take
mask into account when doing so to avoid unnecessary ACCESS_DENIED_ACE.
2015-04-16 Corinna Vinschen <corinna@vinschen.de> 2015-04-16 Corinna Vinschen <corinna@vinschen.de>
* sec_acl.cc (get_posix_access): Only set saw_group_obj flag if we saw * sec_acl.cc (get_posix_access): Only set saw_group_obj flag if we saw

10
winsup/cygwin/sec_acl.cc
View File

@ -274,11 +274,6 @@ set_posix_access (mode_t attr, uid_t uid, gid_t gid,
tmp_idx = searchace (aclbufp, nentries, def | OTHER_OBJ); tmp_idx = searchace (aclbufp, nentries, def | OTHER_OBJ);
other_obj = aclbufp[tmp_idx].a_perm; other_obj = aclbufp[tmp_idx].a_perm;
/* Do we potentially chmod a file with owner SID == group SID? If so,
make sure the owner perms are always >= group perms. */
if (!def && owner_eq_group)
aclbufp[0].a_perm |= group_obj;
/* ... class_obj. Create Cygwin ACE. Only the S_ISGID attribute gets /* ... class_obj. Create Cygwin ACE. Only the S_ISGID attribute gets
inherited. */ inherited. */
access = CYG_ACE_ISBITS_TO_WIN (def ? attr & S_ISGID : attr); access = CYG_ACE_ISBITS_TO_WIN (def ? attr & S_ISGID : attr);
@ -300,6 +295,11 @@ set_posix_access (mode_t attr, uid_t uid, gid_t gid,
inherit)) inherit))
return NULL; return NULL;
/* Do we potentially chmod a file with owner SID == group SID? If so,
make sure the owner perms are always >= group perms. */
if (!def && owner_eq_group)
aclbufp[0].a_perm |= group_obj & class_obj;
/* This loop has two runs, the first w/ check_types == (USER_OBJ | USER), /* This loop has two runs, the first w/ check_types == (USER_OBJ | USER),
the second w/ check_types == (GROUP_OBJ | GROUP). Each run creates the second w/ check_types == (GROUP_OBJ | GROUP). Each run creates
first the deny, then the allow ACEs for the current types. */ first the deny, then the allow ACEs for the current types. */