Skip to contentSkip to conversation

usb: ccid: check ccid apdu length

PATCH In review P J P 2 participants 2 messages Feb 2, 2017 – Feb 3, 2017

lore
Share & tools
lore

P J P

author
#0 lore raw

PATCH 1/1 usb: ccid: check ccid apdu length

From: Prasad J Pandit <[email protected]>

CCID device emulator uses Application Protocol Data Units(APDU) to exchange command and responses to and from the host. The length in these units couldn't be greater than 65536. Add check to ensure the same. It'd also avoid potential integer overflow in emulated_apdu_from_guest.

---
 hw/usb/dev-smartcard-reader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/usb/dev-smartcard-reader.c +1 -1
index 89e11b6..1325ea1 100644
@@ -967,7 +967,7 @@ static void ccid_on_apdu_from_guest(USBCCIDState *s, CCID_XferBlock *recv)
     DPRINTF(s, 1, "%s: seq %d, len %d\n", __func__,
                 recv->hdr.bSeq, len);
     ccid_add_pending_answer(s, (CCID_Header *)recv);
-    if (s->card) {
+    if (s->card && len <= BULK_OUT_DATA_SIZE) {
         ccid_card_apdu_from_guest(s->card, recv->abData, len);
     } else {
         DPRINTF(s, D_WARN, "warning: discarded apdu\n");
Signature · 1 line
2.9.3
#1 lore raw
Quoted 10 lines · P J P

From: Prasad J Pandit <[email protected]>

CCID device emulator uses Application Protocol Data Units(APDU) to exchange command and responses to and from the host. The length in these units couldn't be greater than 65536. Add check to ensure the same. It'd also avoid potential integer overflow in emulated_apdu_from_guest.

Added to usb queue.

thanks,
Gerd