JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix file type mode bit handling on object security.

Browse Source 
* fhandler_tty.cc (fhandler_pty_slave::open): Add S_IFCHR flag
	in call to create_object_sd_from_attribute.
	(fhandler_pty_slave::fstat): Ditto in call to get_object_attribute.
	(fhandler_pty_slave::fchmod): Add an orig_mode flag and ditto for
	both calls.
	(fhandler_pty_master::setup): Ditto in call to
	create_object_sd_from_attribute.
	* security.cc (get_object_attribute): Never add S_IFCHR to mode
	here.  Let the caller decide.
	(create_object_sd_from_attribute): Ditto.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2015-09-03 19:29:55 +02:00
parent 4dc3deea89
commit 6459131096
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/security.cc
View File

@@ -401,14 +401,9 @@ get_object_attribute (HANDLE handle, uid_t *uidret, gid_t *gidret,
mode_t *attribute)
{
security_descriptor sd;
mode_t attr = S_IFCHR;
if (get_object_sd (handle, sd))
return -1;
if (attribute)
*attribute |= S_IFCHR;
else
attribute = &attr;
return get_posix_access (sd, attribute, uidret, gidret, NULL, 0)
>= 0 ? 0 : -1;
}
@@ -417,7 +412,7 @@ int
create_object_sd_from_attribute (uid_t uid, gid_t gid, mode_t attribute,
security_descriptor &sd)
{
return set_posix_access (S_IFCHR | attribute, uid, gid, NULL, 0, sd, false)
return set_posix_access (attribute, uid, gid, NULL, 0, sd, false)
? 0 : -1;
}