security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-15 18:41:03 +02:00
Code Activity

scd: Fix card removal monitor.

Browse Source 
* scd/app.c (app_reset): Call send_client_notification with REMOVAL.
(scd_update_reader_status_file): Likewise.
* scd/command.c (send_client_notifications): Distinguish removal.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2016-12-30 13:17:49 +09:00
parent cdc8d0bd93
commit f300e12a79
3 changed files with 68 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scd/app.c
View File

@ -161,7 +161,7 @@ app_reset (app_t app, ctrl_t ctrl, int send_reset)
err = gpg_error (GPG_ERR_CARD_RESET); err = gpg_error (GPG_ERR_CARD_RESET);
/* Release the same application which is used by other sessions. */ /* Release the same application which is used by other sessions. */
send_client_notifications (app); send_client_notifications (app, 1);
} }
else else
{ {
@ -1035,7 +1035,7 @@ scd_update_reader_status_file (void)
if (a->card_status != status) if (a->card_status != status)
{ {
report_change (a->slot, a->card_status, status); report_change (a->slot, a->card_status, status);
send_client_notifications (a); send_client_notifications (a, status == 0);
if (status == 0) if (status == 0)
{ {

34
scd/command.c
View File

@ -1849,7 +1849,7 @@ send_status_direct (ctrl_t ctrl, const char *keyword, const char *args)
/* Helper to send the clients a status change notification. */ /* Helper to send the clients a status change notification. */
void void
send_client_notifications (app_t app) send_client_notifications (app_t app, int removal)
{ {
struct { struct {
pid_t pid; pid_t pid;
@ -1864,14 +1864,29 @@ send_client_notifications (app_t app)
struct server_local_s *sl; struct server_local_s *sl;
for (sl=session_list; sl; sl = sl->next_session) for (sl=session_list; sl; sl = sl->next_session)
if (sl->ctrl_backlink && sl->ctrl_backlink->app_ctx == app)
{ {
if (sl->event_signal && sl->assuan_ctx pid_t pid;
&& sl->ctrl_backlink->app_ctx == app)
{
pid_t pid = assuan_get_pid (sl->assuan_ctx);
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
HANDLE handle = (void *)sl->event_signal; HANDLE handle;
#else
int signo;
#endif
if (removal)
{
sl->ctrl_backlink->app_ctx = NULL;
sl->card_removed = 1;
release_application (app);
}
if (!sl->event_signal || !sl->assuan_ctx)
continue;
pid = assuan_get_pid (sl->assuan_ctx);
#ifdef HAVE_W32_SYSTEM
handle = (void *)sl->event_signal;
for (kidx=0; kidx < killidx; kidx++) for (kidx=0; kidx < killidx; kidx++)
if (killed[kidx].pid == pid if (killed[kidx].pid == pid
&& killed[kidx].handle == handle) && killed[kidx].handle == handle)
@ -1894,7 +1909,7 @@ send_client_notifications (app_t app)
} }
} }
#else /*!HAVE_W32_SYSTEM*/ #else /*!HAVE_W32_SYSTEM*/
int signo = sl->event_signal; signo = sl->event_signal;
if (pid != (pid_t)(-1) && pid && signo > 0) if (pid != (pid_t)(-1) && pid && signo > 0)
{ {
@ -1919,10 +1934,5 @@ send_client_notifications (app_t app)
} }
} }
#endif /*!HAVE_W32_SYSTEM*/ #endif /*!HAVE_W32_SYSTEM*/
sl->ctrl_backlink->app_ctx = NULL;
sl->card_removed = 1;
release_application (app);
}
} }
} }

2
scd/scdaemon.h
View File

@ -124,7 +124,7 @@ void send_status_info (ctrl_t ctrl, const char *keyword, ...)
GPGRT_ATTR_SENTINEL(1); GPGRT_ATTR_SENTINEL(1);
void send_status_direct (ctrl_t ctrl, const char *keyword, const char *args); void send_status_direct (ctrl_t ctrl, const char *keyword, const char *args);
void scd_update_reader_status_file (void); void scd_update_reader_status_file (void);
void send_client_notifications (app_t app); void send_client_notifications (app_t app, int removal);
#endif /*SCDAEMON_H*/ #endif /*SCDAEMON_H*/