security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

scd: Fix memory leak for RDRNAME and serialize access.

Browse Source 
* scd/apdu.c (close_pcsc_reader): Move locking to...
(apdu_close_reader): ... here, as it's also needed for CCID driver.
Free RDRNAME when closed.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2021-05-07 10:48:13 +09:00
parent 039aed9d40
commit 5d1b413106
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scd/apdu.c
View File

@ -836,13 +836,11 @@ close_pcsc_reader (int slot)
int i; int i;
/*log_debug ("%s: releasing context\n", __func__);*/ /*log_debug ("%s: releasing context\n", __func__);*/
npth_mutex_lock (&reader_table_lock);
if (pcsc.context) if (pcsc.context)
pcsc_release_context (pcsc.context); pcsc_release_context (pcsc.context);
pcsc.context = 0; pcsc.context = 0;
for (i = 0; i < MAX_READER; i++) for (i = 0; i < MAX_READER; i++)
pcsc.rdrname[i] = NULL; pcsc.rdrname[i] = NULL;
npth_mutex_unlock (&reader_table_lock);
} }
return 0; return 0;
} }
@ -2338,15 +2336,21 @@ apdu_close_reader (int slot)
} }
if (reader_table[slot].close_reader) if (reader_table[slot].close_reader)
{ {
npth_mutex_lock (&reader_table_lock);
sw = reader_table[slot].close_reader (slot); sw = reader_table[slot].close_reader (slot);
xfree (reader_table[slot].rdrname);
reader_table[slot].rdrname = NULL;
reader_table[slot].used = 0; reader_table[slot].used = 0;
npth_mutex_unlock (&reader_table_lock);
if (DBG_READER) if (DBG_READER)
log_debug ("leave: apdu_close_reader => 0x%x (close_reader)\n", sw); log_debug ("leave: apdu_close_reader => 0x%x (close_reader)\n", sw);
return sw; return sw;
} }
npth_mutex_lock (&reader_table_lock);
xfree (reader_table[slot].rdrname); xfree (reader_table[slot].rdrname);
reader_table[slot].rdrname = NULL; reader_table[slot].rdrname = NULL;
reader_table[slot].used = 0; reader_table[slot].used = 0;
npth_mutex_unlock (&reader_table_lock);
if (DBG_READER) if (DBG_READER)
log_debug ("leave: apdu_close_reader => SW_HOST_NOT_SUPPORTED\n"); log_debug ("leave: apdu_close_reader => SW_HOST_NOT_SUPPORTED\n");
return SW_HOST_NOT_SUPPORTED; return SW_HOST_NOT_SUPPORTED;