security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

scd: Fix getinfo active_apps.

Browse Source 
* scd/app.c (send_card_and_app_list): Avoid locking recursively.

--

Fixes-commit: 25a140542a9186a27b7df9cd3ca3d478b59cbf1b
GnuPG-bug-id: 7323
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-11-07 08:59:01 +09:00
parent 25a140542a
commit 8359f2e498
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scd/app.c
View File

@ -2756,6 +2756,9 @@ send_card_and_app_list (ctrl_t ctrl, card_t wantcard, int with_apps)
card_t *cardlist = NULL; card_t *cardlist = NULL;
int n, ncardlist; int n, ncardlist;
if (wantcard)
return send_serialno_and_app_status (wantcard, with_apps, ctrl);
card_list_r_lock (); card_list_r_lock ();
for (n=0, c = card_top; c; c = c->next) for (n=0, c = card_top; c; c = c->next)
n++; n++;
@ -2780,7 +2783,6 @@ send_card_and_app_list (ctrl_t ctrl, card_t wantcard, int with_apps)
if (wantcard && wantcard != card) if (wantcard && wantcard != card)
continue; continue;
lock_card (card, ctrl); lock_card (card, ctrl);
err = send_serialno_and_app_status (card, with_apps, ctrl); err = send_serialno_and_app_status (card, with_apps, ctrl);
unlock_card (card); unlock_card (card);