Ankur Tyagi 421f659e20 freerdp3: fix CVE-2026-25941
Details: https://nvd.nist.gov/vuln/detail/CVE-2026-25941

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
Signed-off-by: Anuj Mittal <anuj.mittal@oss.qualcomm.com>
2026-04-13 12:40:21 +05:30

29 lines
1.3 KiB
Diff

From 52f2ae7b2377efc80abb742e452a8565372fd29e Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com>
Date: Mon, 9 Feb 2026 13:18:51 +0100
Subject: [PATCH] [channels,rdpgfx] check available stream length
(cherry picked from commit 2e3b77e28ac6a398897d28ba464dcc5dfab9c9e2)
CVE: CVE-2026-25941
Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/2e3b77e28ac6a398897d28ba464dcc5dfab9c9e2]
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
channels/rdpgfx/client/rdpgfx_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/channels/rdpgfx/client/rdpgfx_main.c b/channels/rdpgfx/client/rdpgfx_main.c
index dd59c8b23..c08436b40 100644
--- a/channels/rdpgfx/client/rdpgfx_main.c
+++ b/channels/rdpgfx/client/rdpgfx_main.c
@@ -1371,7 +1371,8 @@ static UINT rdpgfx_recv_wire_to_surface_2_pdu(GENERIC_CHANNEL_CALLBACK* callback
Stream_Read_UINT8(s, pdu.pixelFormat); /* pixelFormat (1 byte) */
Stream_Read_UINT32(s, pdu.bitmapDataLength); /* bitmapDataLength (4 bytes) */
pdu.bitmapData = Stream_Pointer(s);
- Stream_Seek(s, pdu.bitmapDataLength);
+ if (!Stream_SafeSeek(s, pdu.bitmapDataLength))
+ return ERROR_INVALID_DATA;
DEBUG_RDPGFX(gfx->log,
"RecvWireToSurface2Pdu: surfaceId: %" PRIu16 " codecId: %s (0x%04" PRIX16 ") "