mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-15 16:07:26 +00:00
Code Issues Projects Releases Wiki Activity

xrdp: patch CVE-2022-23483

Browse Source 
Details: https://nvd.nist.gov/vuln/detail/CVE-2022-23483

Pick the patch that mentions this vulnerability explicitly.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
Gyorgy Sarvari
2025-12-05 18:11:32 +01:00
parent e0e34a0615
commit e89a73a759
2 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23483.patch
+65
View File
@@ -0,0 +1,65 @@
From 35cca701c753db65d3c05b7ea4fff9bd09e76661 Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Wed, 7 Dec 2022 10:21:41 +0000
Subject: [PATCH] CVE-2022-23483
Sanitise channel data being passed from application
Avoids OOB read if the size field is incorrect.
CVE: CVE-2022-23483
Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/commit/35cca701c753db65d3c05b7ea4fff9bd09e76661]
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
xrdp/xrdp_mm.c | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
index 74b0516afa..64ae229e01 100644
--- a/xrdp/xrdp_mm.c
+++ b/xrdp/xrdp_mm.c
@@ -676,22 +676,31 @@ xrdp_mm_trans_send_channel_setup(struct xrdp_mm *self, struct trans *trans)
static int
xrdp_mm_trans_process_channel_data(struct xrdp_mm *self, struct stream *s)
{
- int size;
- int total_size;
+ unsigned int size;
+ unsigned int total_size;
int chan_id;
int chan_flags;
- int rv;
-
- in_uint16_le(s, chan_id);
- in_uint16_le(s, chan_flags);
- in_uint16_le(s, size);
- in_uint32_le(s, total_size);
- rv = 0;
+ int rv = 0;
- if (rv == 0)
+ if (!s_check_rem_and_log(s, 10, "Reading channel data header"))
+ {
+ rv = 1;
+ }
+ else
{
- rv = libxrdp_send_to_channel(self->wm->session, chan_id, s->p, size, total_size,
- chan_flags);
+ in_uint16_le(s, chan_id);
+ in_uint16_le(s, chan_flags);
+ in_uint16_le(s, size);
+ in_uint32_le(s, total_size);
+ if (!s_check_rem_and_log(s, size, "Reading channel data data"))
+ {
+ rv = 1;
+ }
+ else
+ {
+ rv = libxrdp_send_to_channel(self->wm->session, chan_id,
+ s->p, size, total_size, chan_flags);
+ }
}
return rv;
meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb
+1
View File
@@ -22,6 +22,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN
file://CVE-2022-23480-1.patch \ file://CVE-2022-23480-1.patch \
file://CVE-2022-23480-2.patch \ file://CVE-2022-23480-2.patch \
file://CVE-2022-23481.patch \ file://CVE-2022-23481.patch \
file://CVE-2022-23483.patch \
" "
SRC_URI[sha256sum] = "f76aa16034689bb8997e56fd554db29ba57caa1bab228a6eda28be4389dedeb9" SRC_URI[sha256sum] = "f76aa16034689bb8997e56fd554db29ba57caa1bab228a6eda28be4389dedeb9"