72 lines
2.5 KiB
Diff
72 lines
2.5 KiB
Diff
From 006440535dd1d581f0e5b7b15295fe511589c3e2 Mon Sep 17 00:00:00 2001
|
|
From: Alon Levy <alevy@redhat.com>
|
|
Date: Mon, 4 Mar 2013 18:55:07 +0200
|
|
Subject: [PATCH 227/241] dev-smartcard-reader: remove aborts (never triggered,
|
|
but just in case)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Alon Levy <alevy@redhat.com>
|
|
Reviewed-by: Marc-André Lureau <mlureau@redhat.com>
|
|
(cherry picked from commit 47bf53af7507986fc473cb308324340448fd85e7)
|
|
---
|
|
hw/usb/dev-smartcard-reader.c | 20 ++++++++++++--------
|
|
1 file changed, 12 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
|
|
index 173dcc9..54ea536 100644
|
|
--- a/hw/usb/dev-smartcard-reader.c
|
|
+++ b/hw/usb/dev-smartcard-reader.c
|
|
@@ -796,6 +796,12 @@ static void ccid_write_data_block(USBCCIDState *s, uint8_t slot, uint8_t seq,
|
|
ccid_reset_error_status(s);
|
|
}
|
|
|
|
+static void ccid_report_error_failed(USBCCIDState *s, uint8_t error)
|
|
+{
|
|
+ s->bmCommandStatus = COMMAND_STATUS_FAILED;
|
|
+ s->bError = error;
|
|
+}
|
|
+
|
|
static void ccid_write_data_block_answer(USBCCIDState *s,
|
|
const uint8_t *data, uint32_t len)
|
|
{
|
|
@@ -803,7 +809,9 @@ static void ccid_write_data_block_answer(USBCCIDState *s,
|
|
uint8_t slot;
|
|
|
|
if (!ccid_has_pending_answers(s)) {
|
|
- abort();
|
|
+ DPRINTF(s, D_WARN, "error: no pending answer to return to guest\n");
|
|
+ ccid_report_error_failed(s, ERROR_ICC_MUTE);
|
|
+ return;
|
|
}
|
|
ccid_remove_pending_answer(s, &slot, &seq);
|
|
ccid_write_data_block(s, slot, seq, data, len);
|
|
@@ -857,12 +865,6 @@ static void ccid_reset_parameters(USBCCIDState *s)
|
|
memcpy(s->abProtocolDataStructure, abDefaultProtocolDataStructure, len);
|
|
}
|
|
|
|
-static void ccid_report_error_failed(USBCCIDState *s, uint8_t error)
|
|
-{
|
|
- s->bmCommandStatus = COMMAND_STATUS_FAILED;
|
|
- s->bError = error;
|
|
-}
|
|
-
|
|
/* NOTE: only a single slot is supported (SLOT_0) */
|
|
static void ccid_on_slot_change(USBCCIDState *s, bool full)
|
|
{
|
|
@@ -1129,7 +1131,9 @@ void ccid_card_send_apdu_to_guest(CCIDCardState *card,
|
|
s->bmCommandStatus = COMMAND_STATUS_NO_ERROR;
|
|
answer = ccid_peek_next_answer(s);
|
|
if (answer == NULL) {
|
|
- abort();
|
|
+ DPRINTF(s, D_WARN, "%s: error: unexpected lack of answer\n", __func__);
|
|
+ ccid_report_error_failed(s, ERROR_HW_ERROR);
|
|
+ return;
|
|
}
|
|
DPRINTF(s, 1, "APDU returned to guest %d (answer seq %d, slot %d)\n",
|
|
len, answer->seq, answer->slot);
|
|
--
|
|
1.8.3.1
|
|
|