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

Cygwin: authz: Use dedicated locks per datastructure 

So far we use a single muto to guard three different datastructures
inside class authz_ctx: the authz HANDLE, the user context HANDLE
and the context cache list.  Split the single muto into three
independent SRWLOCKs and guard all datastrcutures as necessary to
avoid thread contention.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2022-08-22 14:25:05 +02:00
parent e0cc4ea929
commit 2e03e5a040
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
winsup/cygwin/sec/helper.cc
View File

@ -707,7 +707,18 @@ _everyone_sd (void *buf, ACCESS_MASK access)
return psd; return psd;
} }
static NO_COPY muto authz_guard; static NO_COPY SRWLOCK authz_lock = SRWLOCK_INIT;
#define AUTHZ_LOCK() (AcquireSRWLockExclusive (&authz_lock))
#define AUTHZ_UNLOCK() (ReleaseSRWLockExclusive (&authz_lock))
static NO_COPY SRWLOCK user_ctx_lock = SRWLOCK_INIT;
#define USER_CTX_LOCK() (AcquireSRWLockExclusive (&user_ctx_lock))
#define USER_CTX_UNLOCK() (ReleaseSRWLockExclusive (&user_ctx_lock))
static NO_COPY SRWLOCK slist_lock = SRWLOCK_INIT;
#define SLIST_LOCK() (AcquireSRWLockExclusive (&slist_lock))
#define SLIST_UNLOCK() (ReleaseSRWLockExclusive (&slist_lock))
static LUID authz_dummy_luid = { 0 }; static LUID authz_dummy_luid = { 0 };
class authz_ctx_cache_entry class authz_ctx_cache_entry
@ -766,13 +777,13 @@ authz_ctx::operator AUTHZ_RESOURCE_MANAGER_HANDLE ()
if (!authz_hdl) if (!authz_hdl)
{ {
/* Create handle to Authz resource manager */ /* Create handle to Authz resource manager */
authz_guard.init ("authz_guard")->acquire (); AUTHZ_LOCK ();
if (!authz_hdl if (!authz_hdl
&& !AuthzInitializeResourceManager (AUTHZ_RM_FLAG_NO_AUDIT, && !AuthzInitializeResourceManager (AUTHZ_RM_FLAG_NO_AUDIT,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
&authz_hdl)) &authz_hdl))
debug_printf ("AuthzInitializeResourceManager, %E"); debug_printf ("AuthzInitializeResourceManager, %E");
authz_guard.release (); AUTHZ_UNLOCK ();
} }
return authz_hdl; return authz_hdl;
} }
@ -805,9 +816,9 @@ authz_ctx_cache::context (PSID user_sid)
else else
{ {
entry->set (user_sid, ctx_hdl); entry->set (user_sid, ctx_hdl);
authz_guard.acquire (); SLIST_LOCK ();
SLIST_INSERT_HEAD (&ctx_list, entry, ctx_next); SLIST_INSERT_HEAD (&ctx_list, entry, ctx_next);
authz_guard.release (); SLIST_UNLOCK ();
return entry->context (); return entry->context ();
} }
delete entry; delete entry;
@ -830,7 +841,7 @@ authz_ctx::get_user_attribute (mode_t *attribute, PSECURITY_DESCRIPTOR psd,
/* Avoid lock in default case. */ /* Avoid lock in default case. */
if (!user_ctx_hdl) if (!user_ctx_hdl)
{ {
authz_guard.acquire (); USER_CTX_LOCK ();
/* Check user_ctx_hdl again under lock to avoid overwriting /* Check user_ctx_hdl again under lock to avoid overwriting
user_ctx_hdl if it has already been initialized. */ user_ctx_hdl if it has already been initialized. */
if (!user_ctx_hdl if (!user_ctx_hdl
@ -838,7 +849,7 @@ authz_ctx::get_user_attribute (mode_t *attribute, PSECURITY_DESCRIPTOR psd,
authz_dummy_luid, NULL, authz_dummy_luid, NULL,
&user_ctx_hdl)) &user_ctx_hdl))
debug_printf ("AuthzInitializeContextFromToken, %E"); debug_printf ("AuthzInitializeContextFromToken, %E");
authz_guard.release (); USER_CTX_UNLOCK ();
} }
if (user_ctx_hdl) if (user_ctx_hdl)
ctx_hdl = user_ctx_hdl; ctx_hdl = user_ctx_hdl;