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

Better workaround owner/group SIDs being NULL 

* sec_acl.cc (set_posix_access): Replace previous patch.  Return
        EINVAL if uid and/or guid is invalid and not backed by an actual
        Windows account.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-04-16 22:19:57 +02:00
parent de67909ac1
commit ea503bf4c9
2 changed files with 14 additions and 4 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): Replace previous patch. Return
EINVAL if uid and/or guid is invalid and not backed by an actual
Windows account.
2015-04-16 Corinna Vinschen <corinna@vinschen.de> 2015-04-16 Corinna Vinschen <corinna@vinschen.de>
* sec_acl.cc (set_posix_access): Workaround owner/group SIDs being NULL. * sec_acl.cc (set_posix_access): Workaround owner/group SIDs being NULL.

12
winsup/cygwin/sec_acl.cc
View File

@ -154,6 +154,11 @@ set_posix_access (mode_t attr, uid_t uid, gid_t gid,
/* Fetch owner and group and set in security descriptor. */ /* Fetch owner and group and set in security descriptor. */
owner = sidfromuid (uid, &cldap); owner = sidfromuid (uid, &cldap);
group = sidfromgid (gid, &cldap); group = sidfromgid (gid, &cldap);
if (!owner || !group)
{
set_errno (EINVAL);
return NULL;
}
status = RtlSetOwnerSecurityDescriptor (&sd, owner, FALSE); status = RtlSetOwnerSecurityDescriptor (&sd, owner, FALSE);
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
{ {
@ -166,10 +171,9 @@ set_posix_access (mode_t attr, uid_t uid, gid_t gid,
__seterrno_from_nt_status (status); __seterrno_from_nt_status (status);
return NULL; return NULL;
} }
/* If the account DBs are broken, we might end up without SIDs. Better owner_eq_group = RtlEqualSid (owner, group);
check them here. */
if (owner && group)
owner_eq_group = RtlEqualSid (owner, group);
/* No POSIX ACL? Use attr to generate one from scratch. */ /* No POSIX ACL? Use attr to generate one from scratch. */
if (!aclbufp) if (!aclbufp)