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

scd: Use lock_slot for apdu_send_direct.

Browse Source 
* scd/apdu.c (apdu_send_direct): Use lock_slot.

--

Cherry-pick the master commit of:
	f808012ac2cf67ec563da178d963f300a7f2564d

With trylock_slot, it may return SW_HOST_BUSY.  This may occur when
apdu_get_status is called by scd_update_reader_status_file.

Simply using lock_slot is much easier for user of apdu_send_direct.

GnuPG-bug-id: 5831
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-11-05 16:10:49 +09:00
parent 2f2130ff24
commit 3c3765405d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scd/apdu.c
View File

@ -3267,7 +3267,7 @@ apdu_send_direct (int slot, size_t extended_length,
} }
#undef SHORT_RESULT_BUFFER_SIZE #undef SHORT_RESULT_BUFFER_SIZE
if ((sw = trylock_slot (slot))) if ((sw = lock_slot (slot)))
{ {
xfree (apdu_buffer); xfree (apdu_buffer);
xfree (result_buffer); xfree (result_buffer);