|
 |
97f3bec |
From: Prasad J Pandit <address@hidden>
|
|
|
97f3bec |
|
|
|
97f3bec |
When processing remote NDIS control message packets,
|
|
|
97f3bec |
the USB Net device emulator uses a fixed length(4096) data buffer.
|
|
|
97f3bec |
The incoming informationBufferOffset & Length combination could
|
|
|
97f3bec |
overflow and cross that range. Check control message buffer
|
|
|
97f3bec |
offsets and length to avoid it.
|
|
|
97f3bec |
|
|
|
97f3bec |
Reported-by: Qinghao Tang <address@hidden>
|
|
|
97f3bec |
Signed-off-by: Prasad J Pandit <address@hidden>
|
|
|
97f3bec |
---
|
|
|
97f3bec |
hw/usb/dev-network.c | 9 ++++++---
|
|
|
97f3bec |
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
97f3bec |
|
|
|
97f3bec |
Update as per review
|
|
|
97f3bec |
-> https://lists.gnu.org/archive/html/qemu-devel/2016-02/msg03475.html
|
|
|
97f3bec |
|
|
|
97f3bec |
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
|
|
|
97f3bec |
index 8a4ff49..180adce 100644
|
|
|
97f3bec |
--- a/tools/qemu-xen/hw/usb/dev-network.c
|
|
|
97f3bec |
+++ b/tools/qemu-xen/hw/usb/dev-network.c
|
|
|
97f3bec |
@@ -915,8 +915,9 @@ static int rndis_query_response(USBNetState *s,
|
|
|
97f3bec |
|
|
|
97f3bec |
bufoffs = le32_to_cpu(buf->InformationBufferOffset) + 8;
|
|
|
97f3bec |
buflen = le32_to_cpu(buf->InformationBufferLength);
|
|
|
97f3bec |
- if (bufoffs + buflen > length)
|
|
|
97f3bec |
+ if (buflen > length || bufoffs >= length || bufoffs + buflen > length) {
|
|
|
97f3bec |
return USB_RET_STALL;
|
|
|
97f3bec |
+ }
|
|
|
97f3bec |
|
|
|
97f3bec |
infobuflen = ndis_query(s, le32_to_cpu(buf->OID),
|
|
|
97f3bec |
bufoffs + (uint8_t *) buf, buflen, infobuf,
|
|
|
97f3bec |
@@ -961,8 +962,9 @@ static int rndis_set_response(USBNetState *s,
|
|
|
97f3bec |
|
|
|
97f3bec |
bufoffs = le32_to_cpu(buf->InformationBufferOffset) + 8;
|
|
|
97f3bec |
buflen = le32_to_cpu(buf->InformationBufferLength);
|
|
|
97f3bec |
- if (bufoffs + buflen > length)
|
|
|
97f3bec |
+ if (buflen > length || bufoffs >= length || bufoffs + buflen > length) {
|
|
|
97f3bec |
return USB_RET_STALL;
|
|
|
97f3bec |
+ }
|
|
|
97f3bec |
|
|
|
97f3bec |
ret = ndis_set(s, le32_to_cpu(buf->OID),
|
|
|
97f3bec |
bufoffs + (uint8_t *) buf, buflen);
|
|
|
97f3bec |
@@ -1212,8 +1214,9 @@ static void usb_net_handle_dataout(USBNetState *s, USBPacket *p)
|
|
|
97f3bec |
if (le32_to_cpu(msg->MessageType) == RNDIS_PACKET_MSG) {
|
|
|
97f3bec |
uint32_t offs = 8 + le32_to_cpu(msg->DataOffset);
|
|
|
97f3bec |
uint32_t size = le32_to_cpu(msg->DataLength);
|
|
|
97f3bec |
- if (offs + size <= len)
|
|
|
97f3bec |
+ if (offs < len && size < len && offs + size <= len) {
|
|
|
97f3bec |
qemu_send_packet(qemu_get_queue(s->nic), s->out_buf + offs, size);
|
|
|
97f3bec |
+ }
|
|
|
97f3bec |
}
|
|
|
97f3bec |
s->out_ptr -= len;
|
|
|
97f3bec |
memmove(s->out_buf, &s->out_buf[len], s->out_ptr);
|
|
|
97f3bec |
--
|
|
|
97f3bec |
2.5.0
|