drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* autoload.cc (SetUserObjectSecurity): Drop. 

* pinfo.cc (pinfo::set_acl): Use NtSetSecurityObject instead of
	SetKernelObjectSecurity.
	* spawn.cc (spawn_guts): Use NtSetSecurityObject instead of
	SetUserObjectSecurity.
	* uinfo.cc (cygheap_user::init): Ditto.
This commit is contained in:
Corinna Vinschen 2007-07-19 08:36:32 +00:00
parent cce28460fe
commit 5f9c8e2a87
5 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,12 @@
2007-07-19 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (SetUserObjectSecurity): Drop.
* pinfo.cc (pinfo::set_acl): Use NtSetSecurityObject instead of
SetKernelObjectSecurity.
* spawn.cc (spawn_guts): Use NtSetSecurityObject instead of
SetUserObjectSecurity.
* uinfo.cc (cygheap_user::init): Ditto.
2007-07-19 Corinna Vinschen <corinna@vinschen.de> 2007-07-19 Corinna Vinschen <corinna@vinschen.de>
* cygheap.h (init_cygheap::luid): Remove. * cygheap.h (init_cygheap::luid): Remove.

1
winsup/cygwin/autoload.cc
View File

@ -357,7 +357,6 @@ LoadDLLfunc (SendMessageA, 16, user32)
LoadDLLfunc (SetClipboardData, 8, user32) LoadDLLfunc (SetClipboardData, 8, user32)
LoadDLLfunc (SetProcessWindowStation, 4, user32) LoadDLLfunc (SetProcessWindowStation, 4, user32)
LoadDLLfunc (SetTimer, 16, user32) LoadDLLfunc (SetTimer, 16, user32)
LoadDLLfunc (SetUserObjectSecurity, 12, user32)
LoadDLLfunc (accept, 12, ws2_32) LoadDLLfunc (accept, 12, ws2_32)
LoadDLLfunc (bind, 12, ws2_32) LoadDLLfunc (bind, 12, ws2_32)

5
winsup/cygwin/pinfo.cc
View File

@ -291,6 +291,7 @@ pinfo::set_acl()
{ {
PACL acl_buf = (PACL) alloca (1024); PACL acl_buf = (PACL) alloca (1024);
SECURITY_DESCRIPTOR sd; SECURITY_DESCRIPTOR sd;
NTSTATUS status;
sec_acl (acl_buf, true, true, cygheap->user.sid (), sec_acl (acl_buf, true, true, cygheap->user.sid (),
well_known_world_sid, FILE_MAP_READ); well_known_world_sid, FILE_MAP_READ);
@ -298,8 +299,8 @@ pinfo::set_acl()
debug_printf ("InitializeSecurityDescriptor %E"); debug_printf ("InitializeSecurityDescriptor %E");
else if (!SetSecurityDescriptorDacl (&sd, TRUE, acl_buf, FALSE)) else if (!SetSecurityDescriptorDacl (&sd, TRUE, acl_buf, FALSE))
debug_printf ("SetSecurityDescriptorDacl %E"); debug_printf ("SetSecurityDescriptorDacl %E");
else if (!SetKernelObjectSecurity (h, DACL_SECURITY_INFORMATION, &sd)) else if ((status = NtSetSecurityObject (h, DACL_SECURITY_INFORMATION, &sd)))
debug_printf ("SetKernelObjectSecurity %E"); debug_printf ("NtSetSecurityObject %lx", status);
} }
const char * const char *

8
winsup/cygwin/spawn.cc
View File

@ -34,6 +34,7 @@ details. */
#include "environ.h" #include "environ.h"
#include "cygtls.h" #include "cygtls.h"
#include "winf.h" #include "winf.h"
#include "ntdll.h"
static suffix_info exe_suffixes[] = static suffix_info exe_suffixes[] =
{ {
@ -514,15 +515,18 @@ loop:
/* allow the child to interact with our window station/desktop */ /* allow the child to interact with our window station/desktop */
HANDLE hwst, hdsk; HANDLE hwst, hdsk;
SECURITY_INFORMATION dsi = DACL_SECURITY_INFORMATION; SECURITY_INFORMATION dsi = DACL_SECURITY_INFORMATION;
NTSTATUS status;
DWORD n; DWORD n;
char wstname[1024]; char wstname[1024];
char dskname[1024]; char dskname[1024];
hwst = GetProcessWindowStation (); hwst = GetProcessWindowStation ();
SetUserObjectSecurity (hwst, &dsi, get_null_sd ()); if ((status = NtSetSecurityObject (hwst, dsi, get_null_sd ())))
system_printf ("NtSetSecurityObject, %lx", status);
GetUserObjectInformation (hwst, UOI_NAME, wstname, 1024, &n); GetUserObjectInformation (hwst, UOI_NAME, wstname, 1024, &n);
hdsk = GetThreadDesktop (GetCurrentThreadId ()); hdsk = GetThreadDesktop (GetCurrentThreadId ());
SetUserObjectSecurity (hdsk, &dsi, get_null_sd ()); if ((status = NtSetSecurityObject (hdsk, dsi, get_null_sd ())))
system_printf ("NtSetSecurityObject, %lx", status);
GetUserObjectInformation (hdsk, UOI_NAME, dskname, 1024, &n); GetUserObjectInformation (hdsk, UOI_NAME, dskname, 1024, &n);
strcat (wstname, "\\"); strcat (wstname, "\\");
strcat (wstname, dskname); strcat (wstname, dskname);

8
winsup/cygwin/uinfo.cc
View File

@ -30,6 +30,7 @@ details. */
#include "child_info.h" #include "child_info.h"
#include "environ.h" #include "environ.h"
#include "pwdgrp.h" #include "pwdgrp.h"
#include "ntdll.h"
/* Initialize the part of cygheap_user that does not depend on files. /* Initialize the part of cygheap_user that does not depend on files.
The information is used in shared.cc for the user shared. The information is used in shared.cc for the user shared.
@ -72,12 +73,15 @@ cygheap_user::init ()
if (GetSecurityDescriptorDacl (psd, &acl_exists, &dacl.DefaultDacl, &dummy) if (GetSecurityDescriptorDacl (psd, &acl_exists, &dacl.DefaultDacl, &dummy)
&& acl_exists && dacl.DefaultDacl) && acl_exists && dacl.DefaultDacl)
{ {
NTSTATUS status;
/* Set the default DACL and the process DACL */ /* Set the default DACL and the process DACL */
if (!SetTokenInformation (hProcToken, TokenDefaultDacl, &dacl, if (!SetTokenInformation (hProcToken, TokenDefaultDacl, &dacl,
sizeof (dacl))) sizeof (dacl)))
system_printf ("SetTokenInformation (TokenDefaultDacl), %E"); system_printf ("SetTokenInformation (TokenDefaultDacl), %E");
if (!SetKernelObjectSecurity (hMainProc, DACL_SECURITY_INFORMATION, psd)) if ((status = NtSetSecurityObject (hMainProc, DACL_SECURITY_INFORMATION,
system_printf ("SetKernelObjectSecurity, %E"); psd)))
system_printf ("NtSetSecurityObject, %lx", status);
} }
else else
system_printf("Cannot get dacl, %E"); system_printf("Cannot get dacl, %E");