security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

scd: Improve locking of app_do_with_keygrip.

Browse Source 
* scd/app.c (app_do_with_keygrip): Lock once per card.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-09-05 12:58:54 +02:00
parent 4e701953fe
commit c8d739a356
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scd/app.c
View File

@ -1914,24 +1914,33 @@ app_send_card_list (ctrl_t ctrl)
card_t card_t
app_do_with_keygrip (ctrl_t ctrl, int action, const char *keygrip_str) app_do_with_keygrip (ctrl_t ctrl, int action, const char *keygrip_str)
{ {
gpg_error_t err; int locked = 0;
card_t c; card_t c;
app_t a; app_t a;
npth_mutex_lock (&card_list_lock); npth_mutex_lock (&card_list_lock);
for (c = card_top; c; c = c->next) for (c = card_top; c; c = c->next)
for (a = c->app; a; a = a->next) {
if (a->fnc.with_keygrip) if (lock_card (c, ctrl))
{ {
if (!lock_card (c, ctrl)) c = NULL;
{ goto leave_the_loop;
err = a->fnc.with_keygrip (a, ctrl, action, keygrip_str);
unlock_card (c);
if (!err)
goto leave_the_loop;
}
} }
locked = 1;
for (a = c->app; a; a = a->next)
if (a->fnc.with_keygrip)
{
if (DBG_APP)
log_debug ("slot %d app %s: calling with_keygrip(action=%d)\n",
c->slot, xstrapptype (a), action);
if (!a->fnc.with_keygrip (a, ctrl, action, keygrip_str))
goto leave_the_loop;
}
unlock_card (c);
locked = 0;
}
leave_the_loop: leave_the_loop:
@ -1944,6 +1953,11 @@ app_do_with_keygrip (ctrl_t ctrl, int action, const char *keygrip_str)
if (c && c->app && c->app->apptype != a->apptype) if (c && c->app && c->app->apptype != a->apptype)
ctrl->current_apptype = a->apptype; ctrl->current_apptype = a->apptype;
if (locked && c)
{
unlock_card (c);
locked = 0;
}
npth_mutex_unlock (&card_list_lock); npth_mutex_unlock (&card_list_lock);
return c; return c;
} }