From: Alon Levy <alevy@redhat.com>
To: qemu-devel@nongnu.org
Cc: mlureau@redhat.com
Subject: [Qemu-devel] [PATCH v3 20/28] ccid-card-passthru: add atr check
Date: Mon, 22 Apr 2013 18:04:50 +0300 [thread overview]
Message-ID: <1366643098-2566-21-git-send-email-alevy@redhat.com> (raw)
In-Reply-To: <1366643098-2566-1-git-send-email-alevy@redhat.com>
Signed-off-by: Alon Levy <alevy@redhat.com>
---
hw/usb/ccid-card-passthru.c | 59 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index 275b887..16d51c9 100644
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -138,6 +138,59 @@ static void ccid_card_vscard_handle_init(
ccid_card_vscard_send_init(card);
}
+static int check_atr(PassthruState *card, uint8_t *data, int len)
+{
+ int historical_length, opt_bytes;
+ int td_count = 0;
+ int td;
+
+ if (len < 2) {
+ return 0;
+ }
+ historical_length = data[1] & 0xf;
+ opt_bytes = 0;
+ if (data[0] != 0x3b && data[0] != 0x3f) {
+ DPRINTF(card, D_WARN, "atr's T0 is 0x%X, not in {0x3b, 0x3f}\n",
+ data[0]);
+ return 0;
+ }
+ td_count = 0;
+ td = data[1] >> 4;
+ while (td && td_count < 2 && opt_bytes + historical_length + 2 < len) {
+ td_count++;
+ if (td & 0x1) {
+ opt_bytes++;
+ }
+ if (td & 0x2) {
+ opt_bytes++;
+ }
+ if (td & 0x4) {
+ opt_bytes++;
+ }
+ if (td & 0x8) {
+ opt_bytes++;
+ td = data[opt_bytes + 2] >> 4;
+ }
+ }
+ if (len < 2 + historical_length + opt_bytes) {
+ DPRINTF(card, D_WARN,
+ "atr too short: len %d, but historical_len %d, T1 0x%X\n",
+ len, historical_length, data[1]);
+ return 0;
+ }
+ if (len > 2 + historical_length + opt_bytes) {
+ DPRINTF(card, D_WARN,
+ "atr too long: len %d, but hist/opt %d/%d, T1 0x%X\n",
+ len, historical_length, opt_bytes, data[1]);
+ /* let it through */
+ }
+ DPRINTF(card, D_VERBOSE,
+ "atr passes check: %d total length, %d historical, %d optional\n",
+ len, historical_length, opt_bytes);
+
+ return 1;
+}
+
static void ccid_card_vscard_handle_message(PassthruState *card,
VSCMsgHeader *scr_msg_header)
{
@@ -152,6 +205,12 @@ static void ccid_card_vscard_handle_message(PassthruState *card,
VSC_GENERAL_ERROR);
break;
}
+ if (!check_atr(card, data, scr_msg_header->length)) {
+ error_report("ATR is inconsistent, ignoring");
+ ccid_card_vscard_send_error(card, scr_msg_header->reader_id,
+ VSC_GENERAL_ERROR);
+ break;
+ }
memcpy(card->atr, data, scr_msg_header->length);
card->atr_length = scr_msg_header->length;
ccid_card_card_inserted(&card->base);
--
1.8.2
next prev parent reply other threads:[~2013-04-22 15:05 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-22 15:04 [Qemu-devel] [PATCH v3 00/28] ccid and libcacard fixes for windows/mingw Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 01/28] libcacard: correct T0 historical bytes size Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 02/28] ccid-card-emul: do not crash if backend is not provided Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 03/28] ccid: make backend_enum_table "static const" and adjust users Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 04/28] ccid: declare DEFAULT_ATR table to be "static const" Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 05/28] libcacard: use system config directory for nss db on win32 Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 06/28] util: move socket_init() to osdep.c Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 07/28] build-sys: must link with -fstack-protector Alon Levy
2013-05-13 15:20 ` Laurent Desnogues
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 08/28] libcacard: fix mingw64 cross-compilation Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 09/28] libcacard: split vscclient main() from socket reading Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 10/28] libcacard: vscclient to use QemuThread for portability Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 11/28] libcacard: teach vscclient to use GMainLoop " Alon Levy
2013-05-13 14:51 ` Laurent Desnogues
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 12/28] libcacard: remove sql: prefix Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 13/28] libcacard: remove default libcoolkey loading Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 14/28] dev-smartcard-reader: white space fixes Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 15/28] dev-smartcard-reader: nicer debug messages Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 16/28] dev-smartcard-reader: remove aborts (never triggered, but just in case) Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 17/28] dev-smartcard-reader: support windows guest Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 18/28] dev-smartcard-reader: reuse usb.h definitions Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 19/28] libcacard: change default ATR Alon Levy
2013-04-22 15:04 ` Alon Levy [this message]
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 21/28] ccid-card-passthru, dev-smartcard-reader: add debug environment variables Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 22/28] dev-smartcard-reader: define structs for CCID_Parameter internals Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 23/28] dev-smartcard-reader: change default protocol to T=0 Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 24/28] dev-smartcard-reader: copy atr protocol to ccid parameters Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 25/28] libcacard/vreader: add debugging messages for apdu Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 26/28] libcacard: move atr setting from macro to function Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 27/28] dev-smartcard-reader: empty implementation for Mechanical (fail correctly) Alon Levy
2013-04-22 15:04 ` [Qemu-devel] [PATCH v3 28/28] libcacard/cac: change big switch functions to single return point Alon Levy
2013-04-22 20:52 ` [Qemu-devel] [PATCH v3 00/28] ccid and libcacard fixes for windows/mingw Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366643098-2566-21-git-send-email-alevy@redhat.com \
--to=alevy@redhat.com \
--cc=mlureau@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).