mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed input stream length checks in rdpgfx_recv_caps_advertise_pdu

Browse Source
This commit is contained in:
Armin Novak 2019-03-15 08:39:46 +01:00
parent 88b7859c87
commit 8af9c138e3
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
channels/rdpgfx/server/rdpgfx_main.c
View File

@ -1202,13 +1202,6 @@ static UINT rdpgfx_recv_caps_advertise_pdu(RdpgfxServerContext* context,
} }
Stream_Read_UINT16(s, pdu.capsSetCount); /* capsSetCount (2 bytes) */ Stream_Read_UINT16(s, pdu.capsSetCount); /* capsSetCount (2 bytes) */
if (Stream_GetRemainingLength(s) < (pdu.capsSetCount * (RDPGFX_CAPSET_BASE_SIZE + 4)))
{
WLog_ERR(TAG, "not enough data!");
return ERROR_INVALID_DATA;
}
capsSets = calloc(pdu.capsSetCount, (RDPGFX_CAPSET_BASE_SIZE + 4)); capsSets = calloc(pdu.capsSetCount, (RDPGFX_CAPSET_BASE_SIZE + 4));
if (!capsSets) if (!capsSets)
@ -1219,13 +1212,26 @@ static UINT rdpgfx_recv_caps_advertise_pdu(RdpgfxServerContext* context,
for (index = 0; index < pdu.capsSetCount; index++) for (index = 0; index < pdu.capsSetCount; index++)
{ {
RDPGFX_CAPSET* capsSet = &(pdu.capsSets[index]); RDPGFX_CAPSET* capsSet = &(pdu.capsSets[index]);
if (Stream_GetRemainingLength(s) < 8)
{
WLog_ERR(TAG, "not enough data!");
return ERROR_INVALID_DATA;
}
Stream_Read_UINT32(s, capsSet->version); /* version (4 bytes) */ Stream_Read_UINT32(s, capsSet->version); /* version (4 bytes) */
Stream_Read_UINT32(s, capsSet->length); /* capsDataLength (4 bytes) */ Stream_Read_UINT32(s, capsSet->length); /* capsDataLength (4 bytes) */
if (capsSet->length >= 4) if (capsSet->length >= 4)
Stream_Peek_UINT32(s, capsSet->flags); /* capsData (4 bytes) */ {
if (Stream_GetRemainingLength(s) < 4)
return ERROR_INVALID_DATA;
Stream_Seek(s, capsSet->length); Stream_Peek_UINT32(s, capsSet->flags); /* capsData (4 bytes) */
}
if (!Stream_SafeSeek(s, capsSet->length))
return ERROR_INVALID_DATA;
} }
if (context) if (context)