security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

scd: Fix release of transfer object.

Browse Source 
* scd/ccid-driver.c (intr_cb): Handle LIBUSB_TRANSFER_CANCELLED.
(do_close_reader): When callback is active, call
libusb_cancel_transfer and wait callback is fired off.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-01-27 20:43:29 +09:00
parent 25cc8575da
commit f92fe33f11
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
scd/ccid-driver.c
View File

@ -262,9 +262,9 @@ struct ccid_driver_s
unsigned int auto_param:1; unsigned int auto_param:1;
unsigned int auto_pps:1; unsigned int auto_pps:1;
unsigned int auto_ifsd:1; unsigned int auto_ifsd:1;
unsigned int powered_off:1;
unsigned int has_pinpad:2; unsigned int has_pinpad:2;
unsigned int enodev_seen:1; unsigned int enodev_seen:1;
int powered_off;
time_t last_progress; /* Last time we sent progress line. */ time_t last_progress; /* Last time we sent progress line. */
@ -1764,12 +1764,17 @@ intr_cb (struct libusb_transfer *transfer)
DEBUGOUT_1 ("CCID: interrupt callback %d\n", transfer->status); DEBUGOUT_1 ("CCID: interrupt callback %d\n", transfer->status);
if (transfer->status == LIBUSB_TRANSFER_NO_DEVICE if (transfer->status == LIBUSB_TRANSFER_TIMED_OUT)
|| transfer->status == LIBUSB_TRANSFER_ERROR)
{ {
device_removed: int err;
DEBUGOUT ("CCID: device removed\n");
handle->powered_off = 1; submit_again:
/* Submit the URB again to keep watching the INTERRUPT transfer. */
err = libusb_submit_transfer (transfer);
if (err == LIBUSB_ERROR_NO_DEVICE)
goto device_removed;
DEBUGOUT_1 ("CCID submit transfer again %d\n", err);
} }
else if (transfer->status == LIBUSB_TRANSFER_COMPLETED) else if (transfer->status == LIBUSB_TRANSFER_COMPLETED)
{ {
@ -1782,19 +1787,17 @@ intr_cb (struct libusb_transfer *transfer)
} }
else else
{ {
int err; /* Event other than card removal. */
goto submit_again;
/* Submit the URB again to keep watching the INTERRUPT transfer. */
err = libusb_submit_transfer (transfer);
if (err == LIBUSB_ERROR_NO_DEVICE)
goto device_removed;
DEBUGOUT_1 ("CCID submit transfer again %d\n", err);
} }
} }
else if (transfer->status == LIBUSB_TRANSFER_CANCELLED)
handle->powered_off = 1;
else else
{ {
DEBUGOUT_1 ("CCID intr_cb: %d\n", transfer->status); device_removed:
DEBUGOUT ("CCID: device removed\n");
handle->powered_off = 1;
} }
} }
@ -2048,11 +2051,19 @@ do_close_reader (ccid_driver_t handle)
if (!rc) if (!rc)
bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_SlotStatus, bulk_in (handle, msg, sizeof msg, &msglen, RDR_to_PC_SlotStatus,
seqno, 2000, 0); seqno, 2000, 0);
handle->powered_off = 1;
} }
if (handle->idev) if (handle->idev)
{ {
libusb_free_transfer (handle->transfer); if (handle->transfer)
{
if (!handle->powered_off)
{
libusb_cancel_transfer (handle->transfer);
while (!handle->powered_off)
libusb_handle_events_completed (NULL, &handle->powered_off);
}
libusb_free_transfer (handle->transfer);
}
libusb_release_interface (handle->idev, handle->ifc_no); libusb_release_interface (handle->idev, handle->ifc_no);
libusb_close (handle->idev); libusb_close (handle->idev);
handle->idev = NULL; handle->idev = NULL;