619821
From 6116e5c19a7623b2543fbd937970da9a6e0e1ce7 Mon Sep 17 00:00:00 2001
619821
From: Gerd Hoffmann <kraxel@redhat.com>
619821
Date: Tue, 14 Mar 2017 08:52:55 +0100
619821
Subject: [PATCH 22/24] usb-ccid: move header size check
619821
MIME-Version: 1.0
619821
Content-Type: text/plain; charset=UTF-8
619821
Content-Transfer-Encoding: 8bit
619821
619821
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
619821
Message-id: <1489481576-26911-4-git-send-email-kraxel@redhat.com>
619821
Patchwork-id: 74285
619821
O-Subject: [RHEL-7.4 qemu-kvm PATCH 3/4] usb-ccid: move header size check
619821
Bugzilla: 1419818
619821
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
619821
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
619821
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
619821
619821
Move up header size check, so we can use header fields in sanity checks
619821
(in followup patches).  Also reword the debug message.
619821
619821
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
619821
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
619821
Message-id: 1487250819-23764-3-git-send-email-kraxel@redhat.com
619821
(cherry picked from commit 7569c54642e8aa9fa03e250c7c578bd4d3747f00)
619821
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
619821
---
619821
 hw/usb/dev-smartcard-reader.c | 13 ++++++-------
619821
 1 file changed, 6 insertions(+), 7 deletions(-)
619821
619821
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
619821
index 672a7bf..07d15ba 100644
619821
--- a/hw/usb/dev-smartcard-reader.c
619821
+++ b/hw/usb/dev-smartcard-reader.c
619821
@@ -1001,21 +1001,20 @@ static void ccid_handle_bulk_out(USBCCIDState *s, USBPacket *p)
619821
     if (p->iov.size + s->bulk_out_pos > BULK_OUT_DATA_SIZE) {
619821
         goto err;
619821
     }
619821
-    ccid_header = (CCID_Header *)s->bulk_out_data;
619821
     usb_packet_copy(p, s->bulk_out_data + s->bulk_out_pos, p->iov.size);
619821
     s->bulk_out_pos += p->iov.size;
619821
+    if (s->bulk_out_pos < 10) {
619821
+        DPRINTF(s, 1, "%s: header incomplete\n", __func__);
619821
+        goto err;
619821
+    }
619821
+
619821
+    ccid_header = (CCID_Header *)s->bulk_out_data;
619821
     if (p->iov.size == CCID_MAX_PACKET_SIZE) {
619821
         DPRINTF(s, D_VERBOSE,
619821
             "usb-ccid: bulk_in: expecting more packets (%zd/%d)\n",
619821
             p->iov.size, ccid_header->dwLength);
619821
         return;
619821
     }
619821
-    if (s->bulk_out_pos < 10) {
619821
-        DPRINTF(s, 1,
619821
-                "%s: bad USB_TOKEN_OUT length, should be at least 10 bytes\n",
619821
-                __func__);
619821
-        goto err;
619821
-    }
619821
 
619821
     DPRINTF(s, D_MORE_INFO, "%s %x %s\n", __func__,
619821
             ccid_header->bMessageType,
619821
-- 
619821
1.8.3.1
619821