Merge commit from fork

CVE-2026-55645: OOB read in Client Control PDU processing
2026-07-02 16:57:51 +09:00
parent 0af3b1ecf8 b1edb60c1d
commit 0aae834802
1 changed files with 4 additions and 0 deletions
@@ -1157,6 +1157,10 @@ xrdp_rdp_process_data_control(struct xrdp_rdp *self, struct stream *s)
 {
    int action;

+    if (!s_check_rem_and_log(s, 8, "Parsing [MS-RDPBCGR] TS_CONTROL_PDU"))
+    {
+        return 1;
+    }
    in_uint16_le(s, action);
    in_uint8s(s, 2); /* user id */
    in_uint8s(s, 4); /* control id */