|
 |
6fe37b |
From ddf9b3f852c31311f8d726012131f657c9857276 Mon Sep 17 00:00:00 2001
|
|
|
6fe37b |
From: akallabeth <akallabeth@posteo.net>
|
|
|
6fe37b |
Date: Thu, 13 Oct 2022 08:47:51 +0200
|
|
|
6fe37b |
Subject: [PATCH] Fixed missing input buffer length check in urbdrc
|
|
|
6fe37b |
|
|
|
6fe37b |
(cherry picked from commit 497df00f741dd4fc89292aaef2db7368aee45d0d)
|
|
|
6fe37b |
---
|
|
|
6fe37b |
channels/urbdrc/client/data_transfer.c | 20 ++++++++++++++++++++
|
|
|
6fe37b |
1 file changed, 20 insertions(+)
|
|
|
6fe37b |
|
|
|
6fe37b |
diff --git a/channels/urbdrc/client/data_transfer.c b/channels/urbdrc/client/data_transfer.c
|
|
|
6fe37b |
index bb2784055..80e84af48 100644
|
|
|
6fe37b |
--- a/channels/urbdrc/client/data_transfer.c
|
|
|
6fe37b |
+++ b/channels/urbdrc/client/data_transfer.c
|
|
|
6fe37b |
@@ -241,6 +241,10 @@ static UINT urbdrc_process_io_control(IUDEVICE* pdev, URBDRC_CHANNEL_CALLBACK* c
|
|
|
6fe37b |
|
|
|
6fe37b |
Stream_Read_UINT32(s, OutputBufferSize);
|
|
|
6fe37b |
Stream_Read_UINT32(s, RequestId);
|
|
|
6fe37b |
+
|
|
|
6fe37b |
+ if (OutputBufferSize > UINT32_MAX - 4)
|
|
|
6fe37b |
+ return ERROR_INVALID_DATA;
|
|
|
6fe37b |
+
|
|
|
6fe37b |
InterfaceId = ((STREAM_ID_PROXY << 30) | pdev->get_ReqCompletion(pdev));
|
|
|
6fe37b |
out = urb_create_iocompletion(InterfaceId, MessageId, RequestId, OutputBufferSize);
|
|
|
6fe37b |
|
|
|
6fe37b |
@@ -724,6 +728,15 @@ static UINT urb_bulk_or_interrupt_transfer(IUDEVICE* pdev, URBDRC_CHANNEL_CALLBA
|
|
|
6fe37b |
Stream_Read_UINT32(s, TransferFlags); /** TransferFlags */
|
|
|
6fe37b |
Stream_Read_UINT32(s, OutputBufferSize);
|
|
|
6fe37b |
EndpointAddress = (PipeHandle & 0x000000ff);
|
|
|
6fe37b |
+
|
|
|
6fe37b |
+ if (transferDir == USBD_TRANSFER_DIRECTION_OUT)
|
|
|
6fe37b |
+ {
|
|
|
6fe37b |
+ if (!Stream_CheckAndLogRequiredLength(TAG, s, OutputBufferSize))
|
|
|
6fe37b |
+ {
|
|
|
6fe37b |
+ return ERROR_INVALID_DATA;
|
|
|
6fe37b |
+ }
|
|
|
6fe37b |
+ }
|
|
|
6fe37b |
+
|
|
|
6fe37b |
/** process TS_URB_BULK_OR_INTERRUPT_TRANSFER */
|
|
|
6fe37b |
return pdev->bulk_or_interrupt_transfer(pdev, callback, MessageId, RequestId, EndpointAddress,
|
|
|
6fe37b |
TransferFlags, noAck, OutputBufferSize,
|
|
|
6fe37b |
@@ -808,6 +821,13 @@ static UINT urb_isoch_transfer(IUDEVICE* pdev, URBDRC_CHANNEL_CALLBACK* callback
|
|
|
6fe37b |
packetDescriptorData = Stream_Pointer(s);
|
|
|
6fe37b |
Stream_Seek(s, NumberOfPackets * 12);
|
|
|
6fe37b |
Stream_Read_UINT32(s, OutputBufferSize);
|
|
|
6fe37b |
+
|
|
|
6fe37b |
+ if (transferDir == USBD_TRANSFER_DIRECTION_OUT)
|
|
|
6fe37b |
+ {
|
|
|
6fe37b |
+ if (!Stream_CheckAndLogRequiredLength(TAG, s, OutputBufferSize))
|
|
|
6fe37b |
+ return ERROR_INVALID_DATA;
|
|
|
6fe37b |
+ }
|
|
|
6fe37b |
+
|
|
|
6fe37b |
return pdev->isoch_transfer(
|
|
|
6fe37b |
pdev, callback, MessageId, RequestId, EndpointAddress, TransferFlags, StartFrame,
|
|
|
6fe37b |
ErrorCount, noAck, packetDescriptorData, NumberOfPackets, OutputBufferSize,
|
|
|
6fe37b |
--
|
|
|
6fe37b |
2.37.1
|
|
|
6fe37b |
|