[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/11] usb-ccid: add check message size checks
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 11/11] usb-ccid: add check message size checks |
Date: |
Tue, 21 Feb 2017 08:16:25 +0100 |
Check message size too when figuring whenever we should expect more data.
Fix debug message to show useful data, p->iov.size is fixed anyway if we
land there, print how much we got meanwhile instead.
Also check announced message size against actual message size. That
is a more general fix for CVE-2017-5898 than commit "c7dfbf3 usb: ccid:
check ccid apdu length".
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden
---
hw/usb/dev-smartcard-reader.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 1acc1fb..7cd4ed0 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -1011,12 +1011,19 @@ static void ccid_handle_bulk_out(USBCCIDState *s,
USBPacket *p)
}
ccid_header = (CCID_Header *)s->bulk_out_data;
- if (p->iov.size == CCID_MAX_PACKET_SIZE) {
+ if ((s->bulk_out_pos - 10 < ccid_header->dwLength) &&
+ (p->iov.size == CCID_MAX_PACKET_SIZE)) {
DPRINTF(s, D_VERBOSE,
- "usb-ccid: bulk_in: expecting more packets (%zd/%d)\n",
- p->iov.size, ccid_header->dwLength);
+ "usb-ccid: bulk_in: expecting more packets (%d/%d)\n",
+ s->bulk_out_pos - 10, ccid_header->dwLength);
return;
}
+ if (s->bulk_out_pos - 10 != ccid_header->dwLength) {
+ DPRINTF(s, 1,
+ "usb-ccid: bulk_in: message size mismatch (got %d, expected
%d)\n",
+ s->bulk_out_pos - 10, ccid_header->dwLength);
+ goto err;
+ }
DPRINTF(s, D_MORE_INFO, "%s %x %s\n", __func__,
ccid_header->bMessageType,
--
1.8.3.1
- [Qemu-devel] [PULL 07/11] xhci: fix nec vendor quirk handling, (continued)
- [Qemu-devel] [PULL 07/11] xhci: fix nec vendor quirk handling, Gerd Hoffmann, 2017/02/21
- [Qemu-devel] [PULL 03/11] usb: ohci: limit the number of link eds, Gerd Hoffmann, 2017/02/21
- [Qemu-devel] [PULL 06/11] xhci: add qemu xhci controller, Gerd Hoffmann, 2017/02/21
- [Qemu-devel] [PULL 05/11] xhci: drop ER_FULL_HACK workaround, Gerd Hoffmann, 2017/02/21
- [Qemu-devel] [PULL 01/11] usb: ehci: fix memory leak in ehci, Gerd Hoffmann, 2017/02/21
- [Qemu-devel] [PULL 04/11] xhci: apply limits to loops, Gerd Hoffmann, 2017/02/21
- [Qemu-devel] [PULL 10/11] usb-ccid: move header size check, Gerd Hoffmann, 2017/02/21
- [Qemu-devel] [PULL 09/11] usb-ccid: better bulk_out error handling, Gerd Hoffmann, 2017/02/21
- [Qemu-devel] [PULL 08/11] xhci: drop via vendor command handling, Gerd Hoffmann, 2017/02/21
- [Qemu-devel] [PULL 02/11] usb: ohci: fix error return code in servicing iso td, Gerd Hoffmann, 2017/02/21
- [Qemu-devel] [PULL 11/11] usb-ccid: add check message size checks,
Gerd Hoffmann <=
- Re: [Qemu-devel] [PULL 00/11] usb patch queue, Peter Maydell, 2017/02/21