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

Allocate temporary TOKEN_GROUP arrays using TLS 

A user token can be up to 64K in size.  The group list might take a lot
of that so use tmp_pathbuf allocated space rather than stack space
allocted via alloca.  In create_token the TOKEN_GROUP was allocated via
malloc, but the code is needlessly complicated.  Simplify by using
tmp_pathbuf as well.

	* sec_auth.cc (verify_token): Allocate TOKEN_GROUP via tmp_pathbuf.
	(create_token): Ditto.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2016-03-23 17:40:24 +01:00
parent 117737a7fa
commit 155a1ec5fb
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
winsup/cygwin/sec_auth.cc
View File

@ -763,6 +763,7 @@ verify_token (HANDLE token, cygsid &usersid, user_groups &groups, bool *pintern)
NTSTATUS status; NTSTATUS status;
ULONG size; ULONG size;
bool intern = false; bool intern = false;
tmp_pathbuf tp;
if (pintern) if (pintern)
{ {
@ -808,16 +809,10 @@ verify_token (HANDLE token, cygsid &usersid, user_groups &groups, bool *pintern)
return gsid == groups.pgsid; return gsid == groups.pgsid;
} }
PTOKEN_GROUPS my_grps; PTOKEN_GROUPS my_grps = (PTOKEN_GROUPS) tp.w_get ();
status = NtQueryInformationToken (token, TokenGroups, NULL, 0, &size); status = NtQueryInformationToken (token, TokenGroups, my_grps,
if (!NT_SUCCESS (status) && status != STATUS_BUFFER_TOO_SMALL) 2 * NT_MAX_PATH, &size);
{
debug_printf ("NtQueryInformationToken(token, TokenGroups), %y", status);
return false;
}
my_grps = (PTOKEN_GROUPS) alloca (size);
status = NtQueryInformationToken (token, TokenGroups, my_grps, size, &size);
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
{ {
debug_printf ("NtQueryInformationToken(my_token, TokenGroups), %y", debug_printf ("NtQueryInformationToken(my_token, TokenGroups), %y",
@ -903,6 +898,7 @@ create_token (cygsid &usersid, user_groups &new_groups)
HANDLE token = INVALID_HANDLE_VALUE; HANDLE token = INVALID_HANDLE_VALUE;
HANDLE primary_token = INVALID_HANDLE_VALUE; HANDLE primary_token = INVALID_HANDLE_VALUE;
tmp_pathbuf tp;
PTOKEN_GROUPS my_tok_gsids = NULL; PTOKEN_GROUPS my_tok_gsids = NULL;
cygpsid mandatory_integrity_sid; cygpsid mandatory_integrity_sid;
ULONG size; ULONG size;
@ -938,24 +934,14 @@ create_token (cygsid &usersid, user_groups &new_groups)
/* Retrieving current processes group list to be able to inherit /* Retrieving current processes group list to be able to inherit
some important well known group sids. */ some important well known group sids. */
status = NtQueryInformationToken (hProcToken, TokenGroups, NULL, 0, my_tok_gsids = (PTOKEN_GROUPS) tp.w_get ();
&size); status = NtQueryInformationToken (hProcToken, TokenGroups, my_tok_gsids,
if (!NT_SUCCESS (status) && status != STATUS_BUFFER_TOO_SMALL) 2 * NT_MAX_PATH, &size);
debug_printf ("NtQueryInformationToken(hProcToken, TokenGroups), %y", if (!NT_SUCCESS (status))
status);
else if (!(my_tok_gsids = (PTOKEN_GROUPS) malloc (size)))
debug_printf ("malloc (my_tok_gsids) failed.");
else
{ {
status = NtQueryInformationToken (hProcToken, TokenGroups, debug_printf ("NtQueryInformationToken(hProcToken, TokenGroups), "
my_tok_gsids, size, &size); "%y", status);
if (!NT_SUCCESS (status)) my_tok_gsids = NULL;
{
debug_printf ("NtQueryInformationToken(hProcToken, TokenGroups), "
"%y", status);
free (my_tok_gsids);
my_tok_gsids = NULL;
}
} }
} }
@ -1022,8 +1008,6 @@ out:
CloseHandle (token); CloseHandle (token);
if (privs) if (privs)
free (privs); free (privs);
if (my_tok_gsids)
free (my_tok_gsids);
lsa_close_policy (lsa); lsa_close_policy (lsa);
debug_printf ("%p = create_token ()", primary_token); debug_printf ("%p = create_token ()", primary_token);