security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-13 22:21:09 +02:00
Code Activity

agent: Defer calling assuan_release when it's still in use.

Browse Source 
* agent/call-scd.c (struct scd_local_s): Remove LOCK, introduce IN_USE
and INVALID flags.
(unlock_scd): Call assuan_release when CTX is invalid.
(start_scd): Set IN_USE.
(agent_scd_check_aliveness): Don't call assuan_release when it's in use.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2018-11-26 11:05:28 +09:00
parent f45d612469
commit 9fb3f0f3f7
1 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
agent/call-scd.c
View File

@ -54,11 +54,10 @@ struct scd_local_s
SCD_LOCAL_LIST (see below). */ SCD_LOCAL_LIST (see below). */
struct scd_local_s *next_local; struct scd_local_s *next_local;
assuan_context_t ctx; /* NULL or session context for the SCdaemon assuan_context_t ctx; /* NULL or session context for the SCdaemon
used with this connection. */ used with this connection. */
int locked; /* This flag is used to assert proper use of unsigned int in_use: 1; /* CTX is in use. */
start_scd and unlock_scd. */ unsigned int invalid:1; /* CTX is invalid, should be released. */
}; };
@ -132,7 +131,7 @@ initialize_module_call_scd (void)
{ {
err = npth_mutex_init (&start_scd_lock, NULL); err = npth_mutex_init (&start_scd_lock, NULL);
if (err) if (err)
log_fatal ("error initializing mutex: %s\n", strerror (err)); log_fatal ("error initializing mutex: %s\n", strerror (err));
initialized = 1; initialized = 1;
} }
} }
@ -162,14 +161,37 @@ agent_scd_dump_state (void)
static int static int
unlock_scd (ctrl_t ctrl, int rc) unlock_scd (ctrl_t ctrl, int rc)
{ {
if (ctrl->scd_local->locked != 1) int err;
if (ctrl->scd_local->in_use == 0)
{ {
log_error ("unlock_scd: invalid lock count (%d)\n", log_error ("unlock_scd: CTX is not in use\n");
ctrl->scd_local->locked);
if (!rc) if (!rc)
rc = gpg_error (GPG_ERR_INTERNAL); rc = gpg_error (GPG_ERR_INTERNAL);
} }
ctrl->scd_local->locked = 0; ctrl->scd_local->in_use = 0;
if (ctrl->scd_local->invalid)
{
err = npth_mutex_lock (&start_scd_lock);
if (err)
{
log_error ("failed to acquire the start_scd lock: %s\n",
strerror (err));
return gpg_error (GPG_ERR_INTERNAL);
}
assuan_release (ctrl->scd_local->ctx);
ctrl->scd_local->ctx = NULL;
err = npth_mutex_unlock (&start_scd_lock);
if (err)
{
log_error ("failed to release the start_scd lock: %s\n",
strerror (err));
return gpg_error (GPG_ERR_INTERNAL);
}
}
ctrl->scd_local->invalid = 0;
return rc; return rc;
} }
@ -216,15 +238,12 @@ start_scd (ctrl_t ctrl)
scd_local_list = ctrl->scd_local; scd_local_list = ctrl->scd_local;
} }
if (ctrl->scd_local->in_use)
/* Assert that the lock count is as expected. */
if (ctrl->scd_local->locked)
{ {
log_error ("start_scd: invalid lock count (%d)\n", log_error ("start_scd: CTX is in use\n");
ctrl->scd_local->locked);
return gpg_error (GPG_ERR_INTERNAL); return gpg_error (GPG_ERR_INTERNAL);
} }
ctrl->scd_local->locked++; ctrl->scd_local->in_use = 1;
if (ctrl->scd_local->ctx) if (ctrl->scd_local->ctx)
return 0; /* Okay, the context is fine. We used to test for an return 0; /* Okay, the context is fine. We used to test for an
@ -344,7 +363,7 @@ start_scd (ctrl_t ctrl)
detached flag so that under Windows SCDAEMON does not show up a detached flag so that under Windows SCDAEMON does not show up a
new window. */ new window. */
rc = assuan_pipe_connect (ctx, opt.scdaemon_program, argv, rc = assuan_pipe_connect (ctx, opt.scdaemon_program, argv,
no_close_list, atfork_cb, NULL, no_close_list, atfork_cb, NULL,
ASSUAN_PIPE_CONNECT_DETACHED); ASSUAN_PIPE_CONNECT_DETACHED);
if (rc) if (rc)
{ {
@ -414,7 +433,7 @@ start_scd (ctrl_t ctrl)
{ {
unlock_scd (ctrl, err); unlock_scd (ctrl, err);
if (ctx) if (ctx)
assuan_release (ctx); assuan_release (ctx);
} }
else else
{ {
@ -495,14 +514,13 @@ agent_scd_check_aliveness (void)
struct scd_local_s *sl; struct scd_local_s *sl;
assuan_set_flag (primary_scd_ctx, ASSUAN_NO_WAITPID, 1); assuan_set_flag (primary_scd_ctx, ASSUAN_NO_WAITPID, 1);
assuan_release (primary_scd_ctx);
for (sl=scd_local_list; sl; sl = sl->next_local) for (sl=scd_local_list; sl; sl = sl->next_local)
{ {
if (sl->ctx) sl->invalid = 1;
if (!sl->in_use && sl->ctx)
{ {
if (sl->ctx != primary_scd_ctx) assuan_release (sl->ctx);
assuan_release (sl->ctx);
sl->ctx = NULL; sl->ctx = NULL;
} }
} }