From patchwork Fri Dec 5 17:11:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyorgy Sarvari X-Patchwork-Id: 75958 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EE81D33994 for ; Fri, 5 Dec 2025 17:11:38 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.30.1764954697075184958 for ; Fri, 05 Dec 2025 09:11:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=BdQ3GCDx; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: skandigraun@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-47795f6f5c0so16367455e9.1 for ; Fri, 05 Dec 2025 09:11:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764954695; x=1765559495; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=F9sqbpnFrvtEJuPgtGi4c/DTZ7hx+PeUNfu1FG6IfzQ=; b=BdQ3GCDxjcjYFFucaNxd7YLJPl0YeH2PhSGLsZ+jHz6dcuac9rQAfqN+bCfrTC1WcZ ph8TxjY1AcECVkq9hFpvEAoapYjs9QbNIlBbK7xh3mplm3gVdEZdIS5/zi+l1XnaOgnf SQo37JvAhK6zDmKs2flZDxuHGSMFH5v23Cek19p/EbMZiH028qgti6u/l+RCqh0ZkYAL pv9pEsh4SWYyoyvBhkdVAUsxbjyNWgopzOcA/zgV+GIUIyOBJ3OESUHop5fOSgc44n8Y YK4DZDSpOxHbmFpcdtZEDDQbDuyPTPX5nhs1ikbUNjQJ5TxX48qJ08STUsx6N5HHqNct z9Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764954695; x=1765559495; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=F9sqbpnFrvtEJuPgtGi4c/DTZ7hx+PeUNfu1FG6IfzQ=; b=UTKQ+ZUocRJnrkMzb4vy4F0XfiVPNh3RHPQ8jXKwFWg1RYAG4K4+T4DA79HD7HWiXv Z8QH++OD1VSictiwp5pu/Kzhd5w/eNdwAolB8XOoQczbif3MQJG1dJwC+2Q4M+5tRzoe LoXWGBnsr/uYQ30i4YMjEHIlAw7kRUgIZT69sMxsDJY0U+w+mPL57QeMkrkOPbbl9OMj GDq8BsAWssJ/5efB/WI1Pi5+m4BAhuQHT3GGPtfh5Mu5WR3TVBLH8FWif72eHJccxKI0 OwTWqm1L7rgS/jhhoqAc5MaZHRP7UQrMJ8kvSLRJGubMbkZE4DGZ7aKo5cxUWGF7s0Zq ilRg== X-Gm-Message-State: AOJu0YytOmZfuxuhsYNYUGHo10fxVOX308mNnRpgB/zFUBWB7vlueg+H LRquyUNilctiWtQIkgPiU8dDqLTLWhXl74pTrOq6LvHp1xoOXBIPmgTLRyKUog== X-Gm-Gg: ASbGncuJhdslBtiKntPeoMRHOkFB/v0NYXhvIsnx8/U4hOY4CWeSL8zIRx4Hoe7uV5b ePa+V8TiLCme/1huV53XcvR2hUb4QTSsY1hosoNgvOV8jMaLGGmdf49tajveYE+O78Pd2jwiwkT U7nrFzxJLe83qBN2kwYPCEVwdxbdJcDolYg0b3li9K0SYa+S1nFSR4YiiovL13jTx/k6PSuyYK7 LXsh31zGWyz2aE1gfTmnpCBE7WVKlLvI2KNhpXvsmRYOHgx7285CTK+qrSUwTwxcX8dkMkk/I72 om6TaqRdlefPYfdVaPXEwrr8G7EaRu24E2W12vnCdkVq6ZCaL/MOoBfKpJI9+iD5vT0h2sMzRW1 9b/9u3uREBD3sftcGTWlJYoGKfNHAiUGW5Z2Y5Dg0dIUtF5QHcEbhnurM5/VglSS/OsCUPDN7ZB hvAMcbov2a X-Google-Smtp-Source: AGHT+IHt1mNGd4XyhUWuwUAv0dd4zPKLGScMHBU4J8kBcEyF+Rjw02tfBJJ0Pc1lysmUyXf+3QRH+Q== X-Received: by 2002:a05:600c:4588:b0:471:1774:3003 with SMTP id 5b1f17b1804b1-4792af4890fmr97533085e9.29.1764954695061; Fri, 05 Dec 2025 09:11:35 -0800 (PST) Received: from desktop ([51.154.145.205]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6db3sm98563435e9.1.2025.12.05.09.11.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 09:11:34 -0800 (PST) From: Gyorgy Sarvari To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][kirkstone][PATCH 01/10] xrdp: upgrade 0.9.18 -> 0.9.18.1 Date: Fri, 5 Dec 2025 18:11:25 +0100 Message-ID: <20251205171134.1346494-1-skandigraun@gmail.com> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Dec 2025 17:11:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122347 Contains fix for CVE-2022-23613 Changelog: https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.18.1 Signed-off-by: Gyorgy Sarvari --- .../recipes-support/xrdp/{xrdp_0.9.18.bb => xrdp_0.9.18.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/xrdp/{xrdp_0.9.18.bb => xrdp_0.9.18.1.bb} (97%) diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb similarity index 97% rename from meta-oe/recipes-support/xrdp/xrdp_0.9.18.bb rename to meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb index 947ca75388..354eb11730 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb @@ -17,7 +17,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ " -SRC_URI[sha256sum] = "c5eea0af055fac90c632e44fb667f1a25c55de2e34b37127e4cb0aabaef90a0f" +SRC_URI[sha256sum] = "f76aa16034689bb8997e56fd554db29ba57caa1bab228a6eda28be4389dedeb9" CFLAGS += " -Wno-deprecated-declarations" From patchwork Fri Dec 5 17:11:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyorgy Sarvari X-Patchwork-Id: 75959 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC4F9D33998 for ; Fri, 5 Dec 2025 17:11:47 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.24.1764954697775132241 for ; Fri, 05 Dec 2025 09:11:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZDPvPBIn; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: skandigraun@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-477ba2c1ca2so30060085e9.2 for ; Fri, 05 Dec 2025 09:11:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764954696; x=1765559496; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hnLfxVLAjuzRZqFjVjHDs6L8U0nBd1pVUdgeSkMv1cw=; b=ZDPvPBInRep/mq3d1PiWLaM1HExCWfbT4gFDAVFjMlZGkIPphjMQI264vwGpr7T5j9 jh4iDNFzhoiLWrVUUUiDhKa1ls/WE7L6N4Vp0N7MdWcsjb38wEhXAeexfvQUlQdDwdUm 3hPy3VMvU71SNEf3DVYPKAmdil2c7TN+hUFTSALjDWXLqyB5ppW5zOad12RumnOFZtvZ khCNmZlaJRyAZBVavi2EN0JGmD+svTOczg/ho4BYviRjMPn5KXw3ma/xR3M3DhLSLsGV 4t579MWYeBK4t0qurTi00D5lJ1agi+Qov2zZJkjPyObMJ4q6i2z85GuF04nmXM236Vlx aZIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764954696; x=1765559496; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=hnLfxVLAjuzRZqFjVjHDs6L8U0nBd1pVUdgeSkMv1cw=; b=Zf+9nPtP8BVn83vJsiFVYuHasuQqgy2Cq9vzEXCN6WpiNiZHhyXSwSd5OgB6uUVJNK cvAK5e1dkG3ks2Li0SjS7dtTwFLP5oSgSPKqY3hfClW/2kytRg9sx2wIlQKHNXpSviA7 WkVDQs1rq6uFpPHgRzqVO2W//gIhvCiniIlHviJCTLjuoJCdvpnttH6kkpbP4l8yozAK ELaC7S5IdFvZXnRfBncIXgy4lj6kz1ye/mW6IdBQaEUJRF7I5cN2DUmYIUvR1Qyo94/u JGKH+/6ff92VXB8kjDa7p8q1csVPLFfyxrE+K3FuIq581dn4GR65SO4o4UpGX8sklVqf 1Heg== X-Gm-Message-State: AOJu0YwbcL2b+6fBlQD8wDXf/ImbS2R/lSpQY/Wuc1hXaoZgzIc/li9R DMOUpW2z5BaNqD/CLVZ0LWKMwKuZTo7nUziBTA6HbdHkMzHPkZjPo5NHaEwZ7g== X-Gm-Gg: ASbGncvImZH9BuCkol5Qh69oF5hGfoErbo5OB87nYCTh1WI+aVRzPdKux+3TtIPi7hu YdtuZgk90Uu0JP8+Bc0cgCyOQ0j+NeMP+GzEOXgHsyNi3oXlrQBllliLji31x+Zn8sFAhfg1L0b y1CT3MnxcblUzaSPXRemw8v23kVfVzTgMA7IiD2MLyLa0XUaDwzgxUyiCHcoD94bECKDv2RAk+R tOlZm+OEM4RWixgjnk9ValRbTFmmggLGOh257tKulniPPppwnwtKfbhVLqXKs4vh80ddHZEyfGD B2K7v/tXJj0bSmP9ez/1FmdMqd/qYtR0PSaqg4qcjjjcW1LRNSlJqbmxq6gJSlWJicXcAkiXss6 5MS8lAjQUV/6RnE+e6g99+FsPlrUbiCWXi2svfTb9aYirJtHAUbnpyiH5z0RbvdtdUSA5AgpWCI MLH7PXomU9tz2dCFIcbLo= X-Google-Smtp-Source: AGHT+IHH1354UksQYjfj090VNEAlFFGqz6nJ44zoX4Xnsgdue0/MMy2W6nYtzUhkSiewnSjIBGuXQQ== X-Received: by 2002:a05:600c:4f0f:b0:45d:d8d6:7fcc with SMTP id 5b1f17b1804b1-4792f38d58amr77373225e9.27.1764954695788; Fri, 05 Dec 2025 09:11:35 -0800 (PST) Received: from desktop ([51.154.145.205]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6db3sm98563435e9.1.2025.12.05.09.11.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 09:11:35 -0800 (PST) From: Gyorgy Sarvari To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][kirkstone][PATCH 02/10] xrdp: patch CVE-2022-23468 Date: Fri, 5 Dec 2025 18:11:26 +0100 Message-ID: <20251205171134.1346494-2-skandigraun@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251205171134.1346494-1-skandigraun@gmail.com> References: <20251205171134.1346494-1-skandigraun@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Dec 2025 17:11:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122348 Details: https://nvd.nist.gov/vuln/detail/CVE-2022-23468 Pick the patch that mentions this vulnerability explicitly. Signed-off-by: Gyorgy Sarvari --- .../xrdp/xrdp/CVE-2022-23468.patch | 34 +++++++++++++++++++ meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23468.patch diff --git a/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23468.patch b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23468.patch new file mode 100644 index 0000000000..6f8b3a0fb1 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23468.patch @@ -0,0 +1,34 @@ +From 43cf272b1138462c1bdfc48ef7e9142208194382 Mon Sep 17 00:00:00 2001 +From: matt335672 <30179339+matt335672@users.noreply.github.com> +Date: Wed, 7 Dec 2022 09:16:44 +0000 +Subject: [PATCH] CVE-2022-23468 + +Login window - replace g_sprintf() withl g_snprintf() calls + +CVE: CVE-2022-23468 +Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/commit/43cf272b1138462c1bdfc48ef7e9142208194382] +Signed-off-by: Gyorgy Sarvari +--- + xrdp/xrdp_login_wnd.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c +index 7a3134fd3e..28748676a1 100644 +--- a/xrdp/xrdp_login_wnd.c ++++ b/xrdp/xrdp_login_wnd.c +@@ -722,13 +722,13 @@ xrdp_login_wnd_create(struct xrdp_wm *self) + if (globals->ls_title[0] == 0) + { + g_gethostname(buf1, 256); +- g_sprintf(buf, "Login to %s", buf1); ++ g_snprintf(buf, sizeof(buf), "Login to %s", buf1); + set_string(&self->login_window->caption1, buf); + } + else + { + /*self->login_window->caption1 = globals->ls_title[0];*/ +- g_sprintf(buf, "%s", globals->ls_title); ++ g_snprintf(buf, sizeof(buf), "%s", globals->ls_title); + set_string(&self->login_window->caption1, buf); + } + diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb index 354eb11730..2a47b6c68f 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb @@ -15,6 +15,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ file://0001-Fix-the-compile-error.patch \ file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ + file://CVE-2022-23468.patch \ " SRC_URI[sha256sum] = "f76aa16034689bb8997e56fd554db29ba57caa1bab228a6eda28be4389dedeb9" From patchwork Fri Dec 5 17:11:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyorgy Sarvari X-Patchwork-Id: 75961 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03AEBD3399D for ; Fri, 5 Dec 2025 17:11:48 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.25.1764954698142689857 for ; Fri, 05 Dec 2025 09:11:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lqXrYxSx; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: skandigraun@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-47775fb6c56so21303195e9.1 for ; Fri, 05 Dec 2025 09:11:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764954696; x=1765559496; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6vimt2a1rnXuyzs+Z0xUs/6kZcl5d4kIKbMVLt2cNKo=; b=lqXrYxSxN3OKmrnnmkIXNbbSjqH7gi8vh1jBx1yoRvQvPP2jKS1ttWzQRue3B+mOQ8 e8QseZ5Ax+246IcW5YwYGlYnQ5sS/pOcQsQknr7lGtnigClWX/hvY+xqS0NgII67/cvy mN6UvIo+SBYq7D/r/yeeYMvagvtqut6Mmf5eePIaX6UehePuo97tnwrzAz7JI1hG40c5 qzwo6jFjb0irerifUIdv+m5HXJmfQIEL2LpDKwN1h8enXQeQu4emKhqBLKxtz7hIDp9k UCIWHzbNzaFpWHW92TNYNLePWDlAXXit+UUbygO3e6w3qdyrsjklyOJBfHVbroCoTwS5 /toA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764954696; x=1765559496; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6vimt2a1rnXuyzs+Z0xUs/6kZcl5d4kIKbMVLt2cNKo=; b=KYHE+H+Ii0Nv9gev7V4ktaLlfF1ul9q7g+rnLexcVkXdBglEE8ViTvDoXS89xjAVIC f9R0d09sLtGL9lrX3/1RrD0pKjA/QXnHwT/IXzUS98q80n64o3luZaycEYmaHQB+CZWJ U5XRdZmMHav4bxKzrDXsVOd6VPMzVyRtybUfK3n8FeEYVEfNs9juD8DGJwL2QJEMx87C cSk0H1MMz829Nyz2cwVR6k4dV3MfBHb4j2XLSSDkLr94LIUWoiR1Yf4d5ZaDmCyzWCVt gPVd0n0E+be2xbC1JokVj9KjBRmkw1//ZKoGI+5fXpHO0FJAuGMAzrHYTcNYmVWQ15zP Km+w== X-Gm-Message-State: AOJu0Ywiiq4OAyMP/iyVOfaJv536pvDEShJss6XfjmRT5txePKOkGKIE jnkZgL8FrvKRx0IUJ6w0u4/isDqYKi7yVrGmnSFI4epwsQMhdcSy0ARrms2/3Q== X-Gm-Gg: ASbGncvg+7GCxR0JzyLPtSTaEX326+eqcFk7m4R0qJhvw93tBYhmzFoliTU9mEqWPjY oK1vq7RwuMCCfn1YWvNfB8/W0dwVAX5EJ0MtfFCWgAioydLbjihqbO5COPpkNLUMzS4aD1TcYl5 kBbkkEhK9q+s27uFqDw0lrHMMd7bFkeG/fsrQ/CLkNPfmBREkRUBqfY1BQYvGOnhlr3kJIU9w4z QUccf/xF/9sG8elLli40Z9rdJ2hvIBEGrftf1ev6fMXsoUeU1JeiQ4Tjq8VEn3TBQZtk6JwYKTo 4W5zr0KRtLY5snA4AhwwnojkZNT1VtkaeyJmzE8cfy8LlQH9LQ/sZjtdt9A6YRDrgrz7/tfcMYN SBto8pmlX5C1CMMe+3V1LaNLLQ6t5Qo0ZRzkSgXnP3Dg+xRfDXhpGzVn3N6qq1WCmL9+hzKKFcE ThQXfe72jl X-Google-Smtp-Source: AGHT+IFypIPOJgPBIEtjsG/P2GQRiMZsfdQQlkEecYQsIOpw+HHWsc4vbERbQtxzo1V7J786KL62bw== X-Received: by 2002:a05:600c:4e15:b0:475:dd89:abc with SMTP id 5b1f17b1804b1-47939df80eemr231185e9.11.1764954696449; Fri, 05 Dec 2025 09:11:36 -0800 (PST) Received: from desktop ([51.154.145.205]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6db3sm98563435e9.1.2025.12.05.09.11.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 09:11:36 -0800 (PST) From: Gyorgy Sarvari To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][kirkstone][PATCH 03/10] xrdp: patch CVE-2022-23477 Date: Fri, 5 Dec 2025 18:11:27 +0100 Message-ID: <20251205171134.1346494-3-skandigraun@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251205171134.1346494-1-skandigraun@gmail.com> References: <20251205171134.1346494-1-skandigraun@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Dec 2025 17:11:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122349 Details: https://nvd.nist.gov/vuln/detail/CVE-2022-23477 Pick the patch that mentions this vulnerability explicitly. Signed-off-by: Gyorgy Sarvari --- .../xrdp/xrdp/CVE-2022-23477.patch | 38 +++++++++++++++++++ meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23477.patch diff --git a/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23477.patch b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23477.patch new file mode 100644 index 0000000000..5c2b48a507 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23477.patch @@ -0,0 +1,38 @@ +From d49f269af82be5f14b193d4edfcb63b547a16ff4 Mon Sep 17 00:00:00 2001 +From: matt335672 <30179339+matt335672@users.noreply.github.com> +Date: Tue, 6 Dec 2022 11:31:31 +0000 +Subject: [PATCH] CVE-2022-23477 + +Prevent buffer overflow for oversized audio format from client + +CVE: CVE-2022-23477 +Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/commit/d49f269af82be5f14b193d4edfcb63b547a16ff4] +Signed-off-by: Gyorgy Sarvari +--- + sesman/chansrv/audin.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/sesman/chansrv/audin.c b/sesman/chansrv/audin.c +index cd802fa519..36a8027a57 100644 +--- a/sesman/chansrv/audin.c ++++ b/sesman/chansrv/audin.c +@@ -181,15 +181,16 @@ audin_send_open(int chan_id) + int error; + int bytes; + struct stream *s; +- struct xr_wave_format_ex *wf; ++ struct xr_wave_format_ex *wf = g_client_formats[g_current_format]; + + LOG_DEVEL(LOG_LEVEL_INFO, "audin_send_open:"); + make_stream(s); +- init_stream(s, 8192); ++ /* wf->cbSize was checked when the format was received */ ++ init_stream(s, wf->cbSize + 64); ++ + out_uint8(s, MSG_SNDIN_OPEN); + out_uint32_le(s, 2048); /* FramesPerPacket */ + out_uint32_le(s, g_current_format); /* initialFormat */ +- wf = g_client_formats[g_current_format]; + out_uint16_le(s, wf->wFormatTag); + out_uint16_le(s, wf->nChannels); + out_uint32_le(s, wf->nSamplesPerSec); diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb index 2a47b6c68f..546741969a 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb @@ -16,6 +16,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN file://0001-Fix-the-compile-error.patch \ file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ file://CVE-2022-23468.patch \ + file://CVE-2022-23477.patch \ " SRC_URI[sha256sum] = "f76aa16034689bb8997e56fd554db29ba57caa1bab228a6eda28be4389dedeb9" From patchwork Fri Dec 5 17:11:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyorgy Sarvari X-Patchwork-Id: 75967 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F88BD339A6 for ; Fri, 5 Dec 2025 17:11:48 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.31.1764954698784810593 for ; Fri, 05 Dec 2025 09:11:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kUwNixhi; spf=pass (domain: gmail.com, ip: 209.85.128.45, mailfrom: skandigraun@gmail.com) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-477770019e4so23808435e9.3 for ; Fri, 05 Dec 2025 09:11:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764954697; x=1765559497; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DNS8rslF+xEAEEsFQJUK4QEYchWzE8+moUTl2z3NyOA=; b=kUwNixhizhwLsoeGsYRe/Ne7DcgTKUons2Wi/n36naoAgCL5if7RHRTV/zpeSFTg+r QfjDfsV4x2yViL7DelAjr9o77nDBhuyCg3Un58YjdfEgeRm3TMOGtojmsW0lBbtwE3iW WVOD4wQxz0ueyMGWxmX8059qEw5fEvJZl9bCiTzAlDMZND8oeKZFYpbJd5msjjoho9/o eOIynFGIkTWrmD5EBw1EiOggXasNsQUEcU5tPKU0ptHvTzneOkgnmBvD1p6ZM6jjVhuG u3Y34TmYE5Jh2kLopDjZ0RSYljVLN0KxbbuCplHGbtNJJuE1GBi1wiP5LBnoYJJcDoZE dtBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764954697; x=1765559497; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=DNS8rslF+xEAEEsFQJUK4QEYchWzE8+moUTl2z3NyOA=; b=F/FR5vlyZuWbvPT0f0B27DbyC1Pl8DPUkveq7EKNSCN2vOPQFuL1Z3hTwo7TZdVzZG JMJ3nLC9FWlRIE60Lbhqywhy4qzYmYlA2cDD2U2FmxI2jKecqJyhk5nu/ESm8+xS6eQD grwNrVKH1ZydUQMtUWn4svuqEYagLsVc9Feqtq0ykbbugOPSdCS+YuR+SN3xFw4gDG6j d0WpCPph1hzenIu4i7wunbl0qm6qomlZha6cAw1RE2XVQQuBeez5jq7qjMO6Oq9Jb3Rr dj2kf2Lqce2Ic0GznyK7VrULy7GNOGneKf/xd/5kjfK/h6H/i/1KwdMASjgnn6Ej4ixl p/jw== X-Gm-Message-State: AOJu0YyYxj2k/I7Xu3na16+i3usGjyEfGicOe1zhosGmRvJkIvJTCg1k yoGb6Nx7kBzKePhHZeeUhBwi2p9WVfAz01GUs2PI8DTlQ/IXeymfc+VRQawYsg== X-Gm-Gg: ASbGncuN8jOOzKn8EtzHD4R4AEkr/C7s7c+KF5HuHbpYehV/zNyet3b7rtKGMcvpaOD UAKiGbplLomyQ3s326QPhej56xQ4XmwbCbQG/3NwYAgN7+sfEO9npwmIr7r3D52Y9v3eMl2e8zK OMGkmdhDlbxoiiYtSYxpt7YQmA2lNe3AuSgr9zRqrcrUIMDKggckl52+tc0QMIWCxOKODL4OV0k uEdp2KhvzmuWIaqoPjm/KBtklZBaN7D73qGYAzWvSRVpvrlyE6uFxdphLg8MrtFlvtrEChJ2weK 6dG8sJyae7vL/nCWeGBSALgWdXi5bxbBZ0pOU1KfB5EiEJAzhlKzIx+OHvQQfjMqn47vqv2KS5v vsUklgpy7LCQkLnuOAXtVCHEQjAh2SIno7NfOXsivWBr9wb7jCwRAD+ArCgsOBhXVt23SN5wW3W if9rBLMvPxNcxd0KaG5gU= X-Google-Smtp-Source: AGHT+IFhHukJOWbwljY787BXxA+oG5QMEhlNRRejupo7t6WbwQiPpSYRZwP0dxGTg4NsX0QhT/Fi0A== X-Received: by 2002:a05:600c:45d1:b0:471:1435:b0ea with SMTP id 5b1f17b1804b1-4792f38d501mr81116675e9.24.1764954697072; Fri, 05 Dec 2025 09:11:37 -0800 (PST) Received: from desktop ([51.154.145.205]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6db3sm98563435e9.1.2025.12.05.09.11.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 09:11:36 -0800 (PST) From: Gyorgy Sarvari To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][kirkstone][PATCH 04/10] xrdp: patch CVE-2022-23478 Date: Fri, 5 Dec 2025 18:11:28 +0100 Message-ID: <20251205171134.1346494-4-skandigraun@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251205171134.1346494-1-skandigraun@gmail.com> References: <20251205171134.1346494-1-skandigraun@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Dec 2025 17:11:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122350 Details: https://nvd.nist.gov/vuln/detail/CVE-2022-23478 Pick the patch that mentions this vulnerability explicitly. Signed-off-by: Gyorgy Sarvari --- .../xrdp/xrdp/CVE-2022-23478.patch | 85 +++++++++++++++++++ meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb | 1 + 2 files changed, 86 insertions(+) create mode 100644 meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23478.patch diff --git a/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23478.patch b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23478.patch new file mode 100644 index 0000000000..de4f773332 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23478.patch @@ -0,0 +1,85 @@ +From 6cb54a1c26b53617e1c79a0abc96d03c4add1eb8 Mon Sep 17 00:00:00 2001 +From: matt335672 <30179339+matt335672@users.noreply.github.com> +Date: Wed, 7 Dec 2022 11:12:42 +0000 +Subject: [PATCH] CVE-2022-23478 + +Fix potential OOB write if invalid chansrv channel opened + +Also removed an unnecessary dynamic memory allocation + +CVE: CVE-2022-23478 +Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/commit/6cb54a1c26b53617e1c79a0abc96d03c4add1eb8] +Signed-off-by: Gyorgy Sarvari +--- + xrdp/xrdp_mm.c | 21 +++++++++------------ + 1 file changed, 9 insertions(+), 12 deletions(-) + +diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c +index 74b0516afa..c91e03ab56 100644 +--- a/xrdp/xrdp_mm.c ++++ b/xrdp/xrdp_mm.c +@@ -1360,7 +1360,7 @@ xrdp_mm_trans_process_drdynvc_channel_open(struct xrdp_mm *self, + int error; + int chan_id; + int chansrv_chan_id; +- char *name; ++ char name[1024 + 1]; + struct xrdp_drdynvc_procs procs; + + if (!s_check_rem(s, 2)) +@@ -1368,33 +1368,32 @@ xrdp_mm_trans_process_drdynvc_channel_open(struct xrdp_mm *self, + return 1; + } + in_uint32_le(s, name_bytes); +- if ((name_bytes < 1) || (name_bytes > 1024)) +- { +- return 1; +- } +- name = g_new(char, name_bytes + 1); +- if (name == NULL) ++ if ((name_bytes < 1) || (name_bytes > (int)(sizeof(name) - 1))) + { + return 1; + } + if (!s_check_rem(s, name_bytes)) + { +- g_free(name); + return 1; + } + in_uint8a(s, name, name_bytes); + name[name_bytes] = 0; + if (!s_check_rem(s, 8)) + { +- g_free(name); + return 1; + } + in_uint32_le(s, flags); + in_uint32_le(s, chansrv_chan_id); ++ if (chansrv_chan_id < 0 || chansrv_chan_id > 255) ++ { ++ LOG(LOG_LEVEL_ERROR, "Attempting to open invalid chansrv channel %d", ++ chansrv_chan_id); ++ return 1; ++ } ++ + if (flags == 0) + { + /* open static channel, not supported */ +- g_free(name); + return 1; + } + else +@@ -1410,13 +1409,11 @@ xrdp_mm_trans_process_drdynvc_channel_open(struct xrdp_mm *self, + &chan_id); + if (error != 0) + { +- g_free(name); + return 1; + } + self->xr2cr_cid_map[chan_id] = chansrv_chan_id; + self->cs2xr_cid_map[chansrv_chan_id] = chan_id; + } +- g_free(name); + return 0; + } + diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb index 546741969a..12918e1a1d 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb @@ -17,6 +17,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ file://CVE-2022-23468.patch \ file://CVE-2022-23477.patch \ + file://CVE-2022-23478.patch \ " SRC_URI[sha256sum] = "f76aa16034689bb8997e56fd554db29ba57caa1bab228a6eda28be4389dedeb9" From patchwork Fri Dec 5 17:11:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyorgy Sarvari X-Patchwork-Id: 75965 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AEFED339A8 for ; Fri, 5 Dec 2025 17:11:48 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.35.1764954700387914465 for ; Fri, 05 Dec 2025 09:11:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VN4Mgw9q; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: skandigraun@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-477ba2c1ca2so30060565e9.2 for ; Fri, 05 Dec 2025 09:11:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764954699; x=1765559499; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XnV+UTQmjKKm1MEqVX3Dx7vruytg6Xgvbsa/48G0dT8=; b=VN4Mgw9qDm7RJ+zEfp3Vv0DnM7fobrV+JvTgm2LKWT6wAeynP7on2LB1aRxnYvBYlH ZunKon+MK1auyzcOgCLQoWwqpRVkihw3384qQD/mEcDCHXCCxG0t560r3PkzWcrr4tmL dnkuTv0B5XH5xa8c3scz8L7++30QqqXNs/DZ2T3xD6vZnwDWZD9NniTCqUaPCYczQGbD f2sLIHl8p1t/r1e9fo5AIYXgmp9ApR8Db1+MYQ9Pweb7BNXWncA8zKU0HUDeiuRkemjD YONVsulwAXaSanH6dcxxwb9q42FW9NHXkpGdInsLKybiRCQIjQ9CF0Yk0f+PFebpgMBO LB7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764954699; x=1765559499; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=XnV+UTQmjKKm1MEqVX3Dx7vruytg6Xgvbsa/48G0dT8=; b=jjMQw7Nf/uf63Ju8ZxEQ35+v6Qm/+cVrCZleu76wMqZ2J7jP/whfDVT3umkKuNaO91 0rq4RAuLOgPSpuxzEuLL4wRZ4OnVQn++CHCFMx6TgzBUks1u+lI8HTX1iHK9lZ1KnFwk O/jiNC2G2mVMFIcfj6oTVTCOwyTmJ2jW9CRxlEmaJH0H91nh4B2lDucUXZCWjN/APLz7 NId6Tv2nPGlkJc3ySuK+zCpyu2qI6j/9cTPN/ZV5VFq65lQLmNSXcBEh1MZxG4Jvt7a0 NmFNbDkjYj92SlPRbqaUZzBi8IM1nba9IL/HvcDbUz01ZtZwPQ7iiuyBB+vTGxg7mldf dIRQ== X-Gm-Message-State: AOJu0YxMiBHmKkHhBqh9/k/LVAxpS4uYBffzZNAQPBZunT55Xfvlg86P 6hlZEygs1SHyoKx9ta7J7NLXRyjW3Zmx8qmZ2bbo0bbFw+NLQWgc5HvNx/cZqQ== X-Gm-Gg: ASbGncsDoumrjzVbH6Fmugv5p0ryYcOaq2IEGj/GBlbRqFilifjMDf8zuqg1LzOcfSc NY+hNFuMBmcHwVMgMB7LS2oica6FUYjm7W32XozcJHOlvavSEFtP7rg5LmIaMZtXSuWD8EfuhSZ WlN+bI58z6AInjTou/NZ9+hkmjN9LAXL7sgEqUKPRdNSJPBH793JELoV92ux0DxLVNed/8JYXx/ U/t912mOldDKSiY37zfjpnBBFz+FH+5wTZE3HkLHyiLDBrVb8h6G1mMuXcb/jnciXRk+0lFNwBH RY1AedCpOgpb0IGMI9kPe8B6CGKWF0QcD0LVEraDT5aToGT+AHbz6Wxyi8gkOgQw97PMNJZ4F7M rUzprLMPAZSmrTUsPYD9JaJsT4pqJciHPBWB/fmPU93Wd2YBHtlOxzN/Vc/uEGhjF3L8m9tL0OG 1fRYbAJ9NL X-Google-Smtp-Source: AGHT+IEB6PevQkFNjIHFaqLXDcgsdeTDJAMBRIyc7vzfHbg0Cpp1g/R/zZIOWRdAmHQBe0/dsRcp1g== X-Received: by 2002:a05:600c:1381:b0:477:a246:8398 with SMTP id 5b1f17b1804b1-47939df15eemr344385e9.2.1764954698632; Fri, 05 Dec 2025 09:11:38 -0800 (PST) Received: from desktop ([51.154.145.205]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6db3sm98563435e9.1.2025.12.05.09.11.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 09:11:38 -0800 (PST) From: Gyorgy Sarvari To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][kirkstone][PATCH 05/10] xrdp: patch CVE-2022-23479 Date: Fri, 5 Dec 2025 18:11:29 +0100 Message-ID: <20251205171134.1346494-5-skandigraun@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251205171134.1346494-1-skandigraun@gmail.com> References: <20251205171134.1346494-1-skandigraun@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Dec 2025 17:11:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122351 Details: https://nvd.nist.gov/vuln/detail/CVE-2022-23479 Pick the patch that mentions this vulnerability explicitly. Signed-off-by: Gyorgy Sarvari --- .../xrdp/xrdp/CVE-2022-23479.patch | 83 +++++++++++++++++++ meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb | 1 + 2 files changed, 84 insertions(+) create mode 100644 meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23479.patch diff --git a/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23479.patch b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23479.patch new file mode 100644 index 0000000000..6940ce8f17 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23479.patch @@ -0,0 +1,83 @@ +From 60864014b733c10881c078048560858067fe5d0f Mon Sep 17 00:00:00 2001 +From: matt335672 <30179339+matt335672@users.noreply.github.com> +Date: Wed, 7 Dec 2022 09:44:56 +0000 +Subject: [PATCH] CVE-2022-23479 + +Detect attempts to overflow input buffer + +If application code hasn't properly sanitised the header_size +for a transport, it is possible for read requests to be issued +which overflow the input buffer. This change detects this +at a low level and bounces the read request. + +CVE: CVE-2022-23479 +Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/commit/60864014b733c10881c078048560858067fe5d0f] +Signed-off-by: Gyorgy Sarvari +--- + common/trans.c | 19 +++++++++++++++---- + common/trans.h | 2 +- + 2 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/common/trans.c b/common/trans.c +index 55d2a63812..1d2d3e68ae 100644 +--- a/common/trans.c ++++ b/common/trans.c +@@ -297,8 +297,8 @@ trans_check_wait_objs(struct trans *self) + tbus in_sck = (tbus) 0; + struct trans *in_trans = (struct trans *) NULL; + int read_bytes = 0; +- int to_read = 0; +- int read_so_far = 0; ++ unsigned int to_read = 0; ++ unsigned int read_so_far = 0; + int rv = 0; + enum xrdp_source cur_source; + +@@ -369,13 +369,24 @@ trans_check_wait_objs(struct trans *self) + } + else if (self->trans_can_recv(self, self->sck, 0)) + { ++ /* CVE-2022-23479 - check a malicious caller hasn't managed ++ * to set the header_size to an unreasonable value */ ++ if (self->header_size > (unsigned int)self->in_s->size) ++ { ++ LOG(LOG_LEVEL_ERROR, ++ "trans_check_wait_objs: Reading %u bytes beyond buffer", ++ self->header_size - (unsigned int)self->in_s->size); ++ self->status = TRANS_STATUS_DOWN; ++ return 1; ++ } ++ + cur_source = XRDP_SOURCE_NONE; + if (self->si != 0) + { + cur_source = self->si->cur_source; + self->si->cur_source = self->my_source; + } +- read_so_far = (int) (self->in_s->end - self->in_s->data); ++ read_so_far = self->in_s->end - self->in_s->data; + to_read = self->header_size - read_so_far; + + if (to_read > 0) +@@ -415,7 +426,7 @@ trans_check_wait_objs(struct trans *self) + } + } + +- read_so_far = (int) (self->in_s->end - self->in_s->data); ++ read_so_far = self->in_s->end - self->in_s->data; + + if (read_so_far == self->header_size) + { +diff --git a/common/trans.h b/common/trans.h +index 1cd89fdac2..313c543b60 100644 +--- a/common/trans.h ++++ b/common/trans.h +@@ -98,7 +98,7 @@ struct trans + ttrans_data_in trans_data_in; + ttrans_conn_in trans_conn_in; + void *callback_data; +- int header_size; ++ unsigned int header_size; + struct stream *in_s; + struct stream *out_s; + char *listen_filename; diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb index 12918e1a1d..45023b9529 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb @@ -18,6 +18,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN file://CVE-2022-23468.patch \ file://CVE-2022-23477.patch \ file://CVE-2022-23478.patch \ + file://CVE-2022-23479.patch \ " SRC_URI[sha256sum] = "f76aa16034689bb8997e56fd554db29ba57caa1bab228a6eda28be4389dedeb9" From patchwork Fri Dec 5 17:11:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyorgy Sarvari X-Patchwork-Id: 75966 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19E6CD339A2 for ; Fri, 5 Dec 2025 17:11:48 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.36.1764954701056800092 for ; Fri, 05 Dec 2025 09:11:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UXNuewtg; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: skandigraun@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4775ae5684fso12728825e9.1 for ; Fri, 05 Dec 2025 09:11:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764954699; x=1765559499; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PXBhL8xiaNH8a12lkwjeTnJVH9x6WzQWCFR/qfvYBco=; b=UXNuewtgQ6Cu7ENf7Yo1tseUJwICPraUfmM5CgmGgFSRgMt12Bqm7ui0/rImBOwRtP 8KEUHtUarmqWwwRo/H788Wo5m1lXrQkVpa6rNTUIZ6dDslqjByjMIxfUvSBaQ6xLs/oM p8AFelbuYhiNZOfFcr4kv2DfSEQHYPEaJzkLY0VBStDej+EkpllWQNPlgMcnuvGRFEnJ yNnWMDtfqNJj/+mtlNMzTny9CF3PbucRdn6y+8dpWj0WTBSGPuoEZCv0QtbY7UjDr2a8 8PKq9ByMixIk7k2l+qxKVCib0oP1qA/3H8PHAXRaPstFkWiZltJ0hzWCtVmAiZolBMo3 /YcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764954699; x=1765559499; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=PXBhL8xiaNH8a12lkwjeTnJVH9x6WzQWCFR/qfvYBco=; b=jkXDpVC+TEl9IN1xfTK6H98Q6mJRGk+AdZ9EKjhZthrzjC4znltnJvexWFlWUWjpYA dLwNMEBUEZ8bTVeeI4YVCycP2AZXUlkLAjRmrPSpOiiaE9i/iGbUUvERgQSN64JhiS0T DYBEP4G6x7G9WwSjnVwsOPs342IWgEfNukl8rneScMA14JDUprPADvOaFycEvAcSwIio 3mUCiYfCT8GBb6KK+NAKrnSIZhQFRR6Xop6mfnOeGKv/EuSdZJ2zFejH7DlMlo9f0zkr LT7/RElqA9WCcQiywTW5RcxTtF2pGP6jTFY1yxlmQltX9pO0skNaE49UoUPuJu1oJETf TPOg== X-Gm-Message-State: AOJu0YyXKWBAAbvqUl9AelDEPrOo41hK0i8H4/EE2120DEJdCHFporLQ 39DRRNlQLbd+74RRAoJnWlNCwr1ufZeEL8FbsLW93xD5iX3A8eBMgP3BhxfQjA== X-Gm-Gg: ASbGncu0HbNdD4UfWed99qszw8qLUlPbMJl2oM1W/i2MYzTobGMSsrBDrXIkcCG/d3G VINS96kRqTyoxmV+T59N5NmJFK4HrY9hpDuYJLr2Z1N8IxmsNfDYALCj+e0dFv/JjcOvY9L7RAd SWfSWOkKxqmDpydPFPVsLLTa2VHxqT81ZBrWlWaug/ZD8oiZm4lMFmVN/Mom/JRbUdRdYRoE2IV X9s6uWxY2pOySdLk57Eoa9GBuQM9eItGaX9o7N7D2JvTpxecHQ2narH0PA+pBaHFML8bUog/tzG Bh/gGUBnrHlPJxM2Be06HUohCdff6YyTa3ShjMW2853aR7/zUHMbI6lyS2L8xSNkXRvqq+RjQqB 5Kq5ND2ZJ9wHu/cvjJV3FiBzTJjcN6CqFEYBvacxOLT5WZorPhRtb+Q5lxwvYLvASdFuMi5eAFs plviOVsadw X-Google-Smtp-Source: AGHT+IG8t0lo7dcfLLyo92AZliOmi4rbahgfLUgIdrN4otJG4iznaMyk122sJpOUxk3PNUybjffO7w== X-Received: by 2002:a05:600c:46ca:b0:471:9da:5248 with SMTP id 5b1f17b1804b1-4792af35091mr113458255e9.26.1764954699298; Fri, 05 Dec 2025 09:11:39 -0800 (PST) Received: from desktop ([51.154.145.205]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6db3sm98563435e9.1.2025.12.05.09.11.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 09:11:38 -0800 (PST) From: Gyorgy Sarvari To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][kirkstone][PATCH 06/10] xrdp: patch CVE-2022-23480 Date: Fri, 5 Dec 2025 18:11:30 +0100 Message-ID: <20251205171134.1346494-6-skandigraun@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251205171134.1346494-1-skandigraun@gmail.com> References: <20251205171134.1346494-1-skandigraun@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Dec 2025 17:11:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122352 Details: https://nvd.nist.gov/vuln/detail/CVE-2022-23480 Pick the patch that mentions this vulnerability explicitly. Signed-off-by: Gyorgy Sarvari --- .../xrdp/xrdp/CVE-2022-23480-1.patch | 356 ++++++++++++++++++ .../xrdp/xrdp/CVE-2022-23480-2.patch | 54 +++ meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb | 2 + 3 files changed, 412 insertions(+) create mode 100644 meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23480-1.patch create mode 100644 meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23480-2.patch diff --git a/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23480-1.patch b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23480-1.patch new file mode 100644 index 0000000000..259044eb00 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23480-1.patch @@ -0,0 +1,356 @@ +From 7ad7b05261c698b867c7c4f1bfffb4f911036847 Mon Sep 17 00:00:00 2001 +From: matt335672 <30179339+matt335672@users.noreply.github.com> +Date: Tue, 6 Dec 2022 12:48:57 +0000 +Subject: [PATCH] CVE-2022-23480 + +Added length checking to redirector response parsing + +CVE: CVE-2022-23480 +Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/commit/7ad7b05261c698b867c7c4f1bfffb4f911036847] +Signed-off-by: Gyorgy Sarvari +--- + sesman/chansrv/devredir.c | 151 +++++++++++++++++++++++++++++++------- + 1 file changed, 123 insertions(+), 28 deletions(-) + +diff --git a/sesman/chansrv/devredir.c b/sesman/chansrv/devredir.c +index a44d47e635..7faa9bfc7a 100644 +--- a/sesman/chansrv/devredir.c ++++ b/sesman/chansrv/devredir.c +@@ -131,10 +131,10 @@ static void devredir_send_server_core_cap_req(void); + static void devredir_send_server_clientID_confirm(void); + static void devredir_send_server_user_logged_on(void); + +-static void devredir_proc_client_core_cap_resp(struct stream *s); +-static void devredir_proc_client_devlist_announce_req(struct stream *s); +-static void devredir_proc_client_devlist_remove_req(struct stream *s); +-static void devredir_proc_device_iocompletion(struct stream *s); ++static int devredir_proc_client_core_cap_resp(struct stream *s); ++static int devredir_proc_client_devlist_announce_req(struct stream *s); ++static int devredir_proc_client_devlist_remove_req(struct stream *s); ++static int devredir_proc_device_iocompletion(struct stream *s); + static void devredir_proc_query_dir_response(IRP *irp, + struct stream *s_in, + tui32 DeviceId, +@@ -323,6 +323,11 @@ devredir_data_in(struct stream *s, int chan_id, int chan_flags, int length, + } + + /* read header from incoming data */ ++ if (!s_check_rem_and_log(ls, 4, "Parsing [MS-RDPEFS] RDPDR_HEADER")) ++ { ++ rv = -1; ++ goto done; ++ } + xstream_rd_u16_le(ls, comp_type); + xstream_rd_u16_le(ls, pktID); + +@@ -340,27 +345,34 @@ devredir_data_in(struct stream *s, int chan_id, int chan_flags, int length, + switch (pktID) + { + case PAKID_CORE_CLIENTID_CONFIRM: +- xstream_seek(ls, 2); /* major version, we ignore it */ +- xstream_rd_u16_le(ls, minor_ver); +- xstream_rd_u32_le(ls, g_clientID); ++ if (!s_check_rem_and_log(ls, 6, "Parsing [MS-RDPEFS] DR_CORE_CLIENT_ANNOUNCE_RSP")) ++ { ++ rv = -1; ++ } ++ else ++ { ++ xstream_seek(ls, 2); /* major version, we ignore it */ ++ xstream_rd_u16_le(ls, minor_ver); ++ xstream_rd_u32_le(ls, g_clientID); + +- g_client_rdp_version = minor_ver; ++ g_client_rdp_version = minor_ver; + +- switch (minor_ver) +- { +- case RDP_CLIENT_50: +- break; ++ switch (minor_ver) ++ { ++ case RDP_CLIENT_50: ++ break; + +- case RDP_CLIENT_51: +- break; ++ case RDP_CLIENT_51: ++ break; + +- case RDP_CLIENT_52: +- break; ++ case RDP_CLIENT_52: ++ break; + +- case RDP_CLIENT_60_61: +- break; ++ case RDP_CLIENT_60_61: ++ break; ++ } ++ // LK_TODO devredir_send_server_clientID_confirm(); + } +- // LK_TODO devredir_send_server_clientID_confirm(); + break; + + case PAKID_CORE_CLIENT_NAME: +@@ -378,19 +390,19 @@ devredir_data_in(struct stream *s, int chan_id, int chan_flags, int length, + break; + + case PAKID_CORE_CLIENT_CAPABILITY: +- devredir_proc_client_core_cap_resp(ls); ++ rv = devredir_proc_client_core_cap_resp(ls); + break; + + case PAKID_CORE_DEVICELIST_ANNOUNCE: +- devredir_proc_client_devlist_announce_req(ls); ++ rv = devredir_proc_client_devlist_announce_req(ls); + break; + + case PAKID_CORE_DEVICELIST_REMOVE: +- devredir_proc_client_devlist_remove_req(ls); ++ rv = devredir_proc_client_devlist_remove_req(ls); + break; + + case PAKID_CORE_DEVICE_IOCOMPLETION: +- devredir_proc_device_iocompletion(ls); ++ rv = devredir_proc_device_iocompletion(ls); + break; + + default: +@@ -727,8 +739,9 @@ devredir_send_drive_dir_request(IRP *irp, tui32 device_id, + * @brief process client's response to our core_capability_req() msg + * + * @param s stream containing client's response ++ * @return 0 for success, -1 otherwise + *****************************************************************************/ +-static void ++static int + devredir_proc_client_core_cap_resp(struct stream *s) + { + int i; +@@ -738,15 +751,31 @@ devredir_proc_client_core_cap_resp(struct stream *s) + tui32 cap_version; + char *holdp; + ++ if (!s_check_rem_and_log(s, 4, "Parsing [MS-RDPEFS] DR_CORE_CAPABLITY_RSP")) ++ { ++ return -1; ++ } + xstream_rd_u16_le(s, num_caps); + xstream_seek(s, 2); /* padding */ + + for (i = 0; i < num_caps; i++) + { + holdp = s->p; ++ if (!s_check_rem_and_log(s, 8, "Parsing [MS-RDPEFS] CAPABILITY_HEADER")) ++ { ++ return -1; ++ } + xstream_rd_u16_le(s, cap_type); + xstream_rd_u16_le(s, cap_len); + xstream_rd_u32_le(s, cap_version); ++ /* Convert the length to a remaining length. Underflow is possible, ++ * but this is an unsigned type so that's OK */ ++ cap_len -= (s->p - holdp); ++ if (cap_len > 0 && ++ !s_check_rem_and_log(s, cap_len, "Parsing [MS-RDPEFS] CAPABILITY_HEADER length")) ++ { ++ return -1; ++ } + + switch (cap_type) + { +@@ -779,11 +808,12 @@ devredir_proc_client_core_cap_resp(struct stream *s) + scard_init(); + break; + } +- s->p = holdp + cap_len; ++ xstream_seek(s, cap_len); + } ++ return 0; + } + +-static void ++static int + devredir_proc_client_devlist_announce_req(struct stream *s) + { + unsigned int i; +@@ -795,12 +825,22 @@ devredir_proc_client_devlist_announce_req(struct stream *s) + enum NTSTATUS response_status; + + /* get number of devices being announced */ ++ if (!s_check_rem_and_log(s, 4, "Parsing [MS-RDPEFS] DR_CORE_DEVICELIST_ANNOUNCE_REQ")) ++ { ++ return -1; ++ } ++ + xstream_rd_u32_le(s, device_count); + + LOG_DEVEL(LOG_LEVEL_DEBUG, "num of devices announced: %d", device_count); + + for (i = 0; i < device_count; i++) + { ++ if (!s_check_rem_and_log(s, 4 + 4 + 8 + 4, ++ "Parsing [MS-RDPEFS] DEVICE_ANNOUNCE")) ++ { ++ return -1; ++ } + xstream_rd_u32_le(s, device_type); + xstream_rd_u32_le(s, g_device_id); + /* get preferred DOS name +@@ -816,6 +856,12 @@ devredir_proc_client_devlist_announce_req(struct stream *s) + + /* Read the device data length from the stream */ + xstream_rd_u32_le(s, device_data_len); ++ if (device_data_len > 0 && ! ++ !s_check_rem_and_log(s, device_data_len, ++ "Parsing [MS-RDPEFS] DEVICE_ANNOUNCE devdata")) ++ { ++ return -1; ++ } + + switch (device_type) + { +@@ -881,9 +927,11 @@ devredir_proc_client_devlist_announce_req(struct stream *s) + devredir_send_server_device_announce_resp(g_device_id, + response_status); + } ++ ++ return 0; + } + +-static void ++static int + devredir_proc_client_devlist_remove_req(struct stream *s) + { + unsigned int i; +@@ -891,7 +939,16 @@ devredir_proc_client_devlist_remove_req(struct stream *s) + tui32 device_id; + + /* get number of devices being announced */ ++ if (!s_check_rem_and_log(s, 4, "Parsing [MS-RDPEFS] DR_DEVICELIST_REMOVE")) ++ { ++ return -1; ++ } + xstream_rd_u32_le(s, device_count); ++ if (!s_check_rem_and_log(s, 4 * device_count, ++ "Parsing [MS-RDPEFS] DR_DEVICELIST_REMOVE list")) ++ { ++ return -1; ++ } + + LOG_DEVEL(LOG_LEVEL_DEBUG, "num of devices removed: %d", device_count); + { +@@ -901,9 +958,10 @@ devredir_proc_client_devlist_remove_req(struct stream *s) + xfuse_delete_share(device_id); + } + } ++ return 0; + } + +-static void ++static int + devredir_proc_device_iocompletion(struct stream *s) + { + IRP *irp = NULL; +@@ -914,6 +972,10 @@ devredir_proc_device_iocompletion(struct stream *s) + tui32 Length; + enum COMPLETION_TYPE comp_type; + ++ if (!s_check_rem_and_log(s, 12, "Parsing [MS-RDPEFS] DR_DEVICE_IOCOMPLETION")) ++ { ++ return -1; ++ } + xstream_rd_u32_le(s, DeviceId); + xstream_rd_u32_le(s, CompletionId); + xstream_rd_u32_le(s, IoStatus32); +@@ -959,6 +1021,10 @@ devredir_proc_device_iocompletion(struct stream *s) + } + else + { ++ if (!s_check_rem_and_log(s, 4, "Parsing [MS-RDPEFS] DR_CREATE_RSP")) ++ { ++ return -1; ++ } + xstream_rd_u32_le(s, irp->FileId); + devredir_send_drive_dir_request(irp, DeviceId, + 1, irp->pathname); +@@ -966,6 +1032,10 @@ devredir_proc_device_iocompletion(struct stream *s) + break; + + case CID_CREATE_REQ: ++ if (!s_check_rem_and_log(s, 4, "Parsing [MS-RDPEFS] DR_CREATE_RSP")) ++ { ++ return -1; ++ } + xstream_rd_u32_le(s, irp->FileId); + + xfuse_devredir_cb_create_file( +@@ -978,6 +1048,10 @@ devredir_proc_device_iocompletion(struct stream *s) + break; + + case CID_OPEN_REQ: ++ if (!s_check_rem_and_log(s, 4, "Parsing [MS-RDPEFS] DR_CREATE_RSP")) ++ { ++ return -1; ++ } + xstream_rd_u32_le(s, irp->FileId); + + xfuse_devredir_cb_open_file((struct state_open *) irp->fuse_info, +@@ -989,7 +1063,15 @@ devredir_proc_device_iocompletion(struct stream *s) + break; + + case CID_READ: ++ if (!s_check_rem_and_log(s, 4, "Parsing [MS-RDPEFS] DR_READ_RSP")) ++ { ++ return -1; ++ } + xstream_rd_u32_le(s, Length); ++ if (!s_check_rem_and_log(s, Length, "Parsing [MS-RDPEFS] DR_READ_RSP")) ++ { ++ return -1; ++ } + xfuse_devredir_cb_read_file((struct state_read *) irp->fuse_info, + IoStatus, + s->p, Length); +@@ -997,6 +1079,10 @@ devredir_proc_device_iocompletion(struct stream *s) + break; + + case CID_WRITE: ++ if (!s_check_rem_and_log(s, 4, "Parsing [MS-RDPEFS] DR_WRITE_RSP")) ++ { ++ return -1; ++ } + xstream_rd_u32_le(s, Length); + xfuse_devredir_cb_write_file((struct state_write *) irp->fuse_info, + IoStatus, +@@ -1019,6 +1105,10 @@ devredir_proc_device_iocompletion(struct stream *s) + break; + + case CID_RMDIR_OR_FILE: ++ if (!s_check_rem_and_log(s, 4, "Parsing [MS-RDPEFS] DR_CREATE_RSP")) ++ { ++ return -1; ++ } + xstream_rd_u32_le(s, irp->FileId); + devredir_proc_cid_rmdir_or_file(irp, IoStatus); + break; +@@ -1028,6 +1118,10 @@ devredir_proc_device_iocompletion(struct stream *s) + break; + + case CID_RENAME_FILE: ++ if (!s_check_rem_and_log(s, 4, "Parsing [MS-RDPEFS] DR_CREATE_RSP")) ++ { ++ return -1; ++ } + xstream_rd_u32_le(s, irp->FileId); + devredir_proc_cid_rename_file(irp, IoStatus); + break; +@@ -1051,6 +1145,7 @@ devredir_proc_device_iocompletion(struct stream *s) + break; + } + } ++ return 0; + } + + static void diff --git a/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23480-2.patch b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23480-2.patch new file mode 100644 index 0000000000..38c444efcf --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23480-2.patch @@ -0,0 +1,54 @@ +From 191ed3e3fa892c7dc26e142c7af7af546fcce87d Mon Sep 17 00:00:00 2001 +From: matt335672 <30179339+matt335672@users.noreply.github.com> +Date: Thu, 8 Dec 2022 14:13:48 +0000 +Subject: [PATCH] Remove unused g_full_name_for_filesystem + +Not only was this unused, the way it was read could lead to a +buffer overflow (CVE-2022-23480) + +CVE: CVE-2022-23480 +Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/commit/191ed3e3fa892c7dc26e142c7af7af546fcce87d] +Signed-off-by: Gyorgy Sarvari +--- + sesman/chansrv/devredir.c | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +diff --git a/sesman/chansrv/devredir.c b/sesman/chansrv/devredir.c +index 7faa9bfc7a..6ce35e34de 100644 +--- a/sesman/chansrv/devredir.c ++++ b/sesman/chansrv/devredir.c +@@ -103,7 +103,6 @@ int g_is_port_redir_supported = 0; + int g_is_drive_redir_supported = 0; + int g_is_smartcard_redir_supported = 0; + int g_drive_redir_version = 1; +-char g_full_name_for_filesystem[1024]; + tui32 g_completion_id = 1; + + tui32 g_clientID; /* unique client ID - announced by client */ +@@ -866,21 +865,18 @@ devredir_proc_client_devlist_announce_req(struct stream *s) + switch (device_type) + { + case RDPDR_DTYP_FILESYSTEM: +- /* get device data len */ +- if (device_data_len) +- { +- xstream_rd_string(g_full_name_for_filesystem, s, +- device_data_len); +- } ++ /* At present we don't use the full name - see ++ * [MS-RDPEFS] 2.2.3.1 for details of the contents */ ++ xstream_skip_u8(s, device_data_len); + + LOG(LOG_LEVEL_INFO, "Detected remote drive '%s'", + preferred_dos_name); + + LOG_DEVEL(LOG_LEVEL_DEBUG, + "device_type=FILE_SYSTEM device_id=0x%x dosname=%s " +- "device_data_len=%d full_name=%s", g_device_id, ++ "device_data_len=%d", g_device_id, + preferred_dos_name, +- device_data_len, g_full_name_for_filesystem); ++ device_data_len); + + response_status = STATUS_SUCCESS; + diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb index 45023b9529..012a70ef73 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb @@ -19,6 +19,8 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN file://CVE-2022-23477.patch \ file://CVE-2022-23478.patch \ file://CVE-2022-23479.patch \ + file://CVE-2022-23480-1.patch \ + file://CVE-2022-23480-2.patch \ " SRC_URI[sha256sum] = "f76aa16034689bb8997e56fd554db29ba57caa1bab228a6eda28be4389dedeb9" From patchwork Fri Dec 5 17:11:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyorgy Sarvari X-Patchwork-Id: 75964 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10A4FD339A0 for ; Fri, 5 Dec 2025 17:11:48 +0000 (UTC) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.26.1764954701653933121 for ; Fri, 05 Dec 2025 09:11:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=R9kZO/hz; spf=pass (domain: gmail.com, ip: 209.85.128.42, mailfrom: skandigraun@gmail.com) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-477a219dbcaso26008935e9.3 for ; Fri, 05 Dec 2025 09:11:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764954700; x=1765559500; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=iQyCkJEsaBx1RHlVqB/24Og4Tg3xFFDzhpJonchUeyU=; b=R9kZO/hzwxo9dezpBGbJuD7k1qM+JfIpIWhW7hMkifim2GIJZt8M5v1n4x2ZRl34ZP j7K9dDooqlKC7R2mQ3Hi/zgzL5i6V8fTcGDGNtVfvZ2NsDKssg7yST597yoZqx+dQ0Ra bxc7B69WSgVIp3YTIzLvT6GEWd3he2NhHr+J0pVpFXjTBF8DmE1R5NUkVYczDJTls5yq nkhT0vuOK1AsmR+8Um8xPJ/57DKx9GdXvY/pw7OsYc7ifogTed/5gBJhwx4u0vsh+Yp6 dh6aDybQ1cD1xoNFKxKj80ewbyMFuaG2pSyhfvya5YFRlC23rOJFA+6g4YGdc6M73CMn jbww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764954700; x=1765559500; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=iQyCkJEsaBx1RHlVqB/24Og4Tg3xFFDzhpJonchUeyU=; b=aM3eX/E3GmtgqiQvu3w3Q5DFv16GuFxnOxq959zMPZoDCoG+45yXxm5Iyh2OkV35fu ZnC9qS4u2rv4i6LV7ZAWBWy2qWs4QF8gji2JZdn4LIlEOfcpJq0GrttoxRqzU3AJu6e9 1P1Bh7saMYW08bZrAFeL22D5vth/S0fLI29TaelUb47u9ypC6s8MqUQPA2QLOggErO+V rtNPHxQDPXfdMvIbyfJ+fW25Ov5Gh9HR4BFTI59O9KBHzVq8CVcjezt4Xr6g0HDU90T/ UJ7ThkflmaxIJ55n+PLXbUL6mVszHfp/3b8OdoV4esIugJDZiWkPJHFa5DGNozwTrxfN Kb/A== X-Gm-Message-State: AOJu0YzFGdM3L2OyWZBbCcj+rpdOz54gOIoHvPlhwpyVfHHbOYwnWd+G ovqoXI7+d6vj3gkisQKjnT2uIyB53EOLQuAtXnxlr1mxEbrJy+Copn9mmF1aMQ== X-Gm-Gg: ASbGncszdVLIf9BFbBWYkqhuQnlt5ZaBo/DBGy72VC4AX7zLiwxBB8SNz6BLxQMJuX3 ltQgCEteJMPNTrQ5j5jSZLJYKJe8pqq1Noa5kUJp6enWk9KffhPwagDGO3ZL+ijVl69VcJX9/kL v9quZZzKUmKwPq2/bch4psQGrDlWTg9BuDicNX7jVjcDpLvnfHFATWbKVkLQY4CWP2yfe/nTpdq fS5QVS2VVAMKHddBDuMB/fMBqb9vFgKkl9GoLkmtSKD3/IKDD74nvPtjwUJLSxBONgPK/jJd3EL XkQPa6QLFI/4noC5yRkD8lrpFlGPKrGLF2cEuH27TNmjzrkuYlBRy37vC2bfvGVc6mTpOSI1o9Y /VX2FMkznKxLUGQRfiafHtusuRFgqlAExZaDHAI+rKbx21JjUEY/OeHvHzJqruUpm4NaT5a080j h8Vw9ZgIQr X-Google-Smtp-Source: AGHT+IHogebjz4Bb4xRkX63XePVbQNz8s62zrk8fATqZ1QQVvHeX1nn8OlGatlZVrfAYUtefLKyFqQ== X-Received: by 2002:a05:600c:1393:b0:477:7a87:48d1 with SMTP id 5b1f17b1804b1-4792af43957mr111869505e9.30.1764954699908; Fri, 05 Dec 2025 09:11:39 -0800 (PST) Received: from desktop ([51.154.145.205]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6db3sm98563435e9.1.2025.12.05.09.11.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 09:11:39 -0800 (PST) From: Gyorgy Sarvari To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][kirkstone][PATCH 07/10] xrdp: patch CVE-2022-23481 Date: Fri, 5 Dec 2025 18:11:31 +0100 Message-ID: <20251205171134.1346494-7-skandigraun@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251205171134.1346494-1-skandigraun@gmail.com> References: <20251205171134.1346494-1-skandigraun@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Dec 2025 17:11:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122353 Details: https://nvd.nist.gov/vuln/detail/CVE-2022-23481 Pick the patch that mentions this vulnerability explicitly. Signed-off-by: Gyorgy Sarvari --- .../xrdp/xrdp/CVE-2022-23481.patch | 46 +++++++++++++++++++ meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23481.patch diff --git a/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23481.patch b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23481.patch new file mode 100644 index 0000000000..bb2d3c8cfa --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23481.patch @@ -0,0 +1,46 @@ +From c77e974080da8267d902f99ca5ab7d22ea02d98c Mon Sep 17 00:00:00 2001 +From: matt335672 <30179339+matt335672@users.noreply.github.com> +Date: Wed, 7 Dec 2022 10:40:25 +0000 +Subject: [PATCH] CVE-2022-23481 + +Add length checks to client confirm active PDU parsing + +CVE: CVE-2022-23481 +Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/commit/c77e974080da8267d902f99ca5ab7d22ea02d98c] +Signed-off-by: Gyorgy Sarvari +--- + libxrdp/xrdp_caps.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/libxrdp/xrdp_caps.c b/libxrdp/xrdp_caps.c +index 5c5e74a579..ac21cc0a18 100644 +--- a/libxrdp/xrdp_caps.c ++++ b/libxrdp/xrdp_caps.c +@@ -667,13 +667,27 @@ xrdp_caps_process_confirm_active(struct xrdp_rdp *self, struct stream *s) + int len; + char *p; + ++ if (!s_check_rem_and_log(s, 10, ++ "Parsing [MS-RDPBCGR] TS_CONFIRM_ACTIVE_PDU" ++ " - header")) ++ { ++ return 1; ++ } + in_uint8s(s, 4); /* rdp_shareid */ + in_uint8s(s, 2); /* userid */ + in_uint16_le(s, source_len); /* sizeof RDP_SOURCE */ + in_uint16_le(s, cap_len); ++ ++ if (!s_check_rem_and_log(s, source_len + 2 + 2, ++ "Parsing [MS-RDPBCGR] TS_CONFIRM_ACTIVE_PDU" ++ " - header2")) ++ { ++ return 1; ++ } + in_uint8s(s, source_len); + in_uint16_le(s, num_caps); + in_uint8s(s, 2); /* pad */ ++ + LOG_DEVEL(LOG_LEVEL_TRACE, "Received [MS-RDPBCGR] TS_CONFIRM_ACTIVE_PDU " + "shareID (ignored), originatorID (ignored), lengthSourceDescriptor %d, " + "lengthCombinedCapabilities %d, sourceDescriptor (ignored), " diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb index 012a70ef73..db191d5645 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb @@ -21,6 +21,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN file://CVE-2022-23479.patch \ file://CVE-2022-23480-1.patch \ file://CVE-2022-23480-2.patch \ + file://CVE-2022-23481.patch \ " SRC_URI[sha256sum] = "f76aa16034689bb8997e56fd554db29ba57caa1bab228a6eda28be4389dedeb9" From patchwork Fri Dec 5 17:11:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyorgy Sarvari X-Patchwork-Id: 75963 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B4E9D3399B for ; Fri, 5 Dec 2025 17:11:48 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.27.1764954702400530280 for ; Fri, 05 Dec 2025 09:11:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Sr90lE81; spf=pass (domain: gmail.com, ip: 209.85.128.54, mailfrom: skandigraun@gmail.com) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-477b1cc8fb4so16398715e9.1 for ; Fri, 05 Dec 2025 09:11:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764954701; x=1765559501; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6kVBlZwutzG1mgzUCdE0Zdi8rxoVQiwk6pfRD94mVxM=; b=Sr90lE81gDCURkVnGQvrLw2Eg1TLXjj+oI45M6DaHXyRVgY6ra5EJypIbOSJI2oQu/ AvqupHStc2/GKGKQdEPILbZ7d1RFHDd/fngew4N1I5M99LZnDqktFLTHaMlhTDtC2mTC XPvYhuvNdaUGVqdZCqzjqhiUfyeYpXITu5MCTC86htVYo/IOEHunmrl/eWpaAXN5o7FO LfwqEA7Pw6o5bBbcoH88ALtZKVP6D9QCJFtULrRqhJ9MJcTepuFuXpapCuR+ZmMXAJ6u m7Ejjq9tzUcvz18sfd3XhH2IaBXE/HDYNGpIZsPmLqTBlzD7wa0ICSou4ZWFjnV7C0M0 p79Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764954701; x=1765559501; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6kVBlZwutzG1mgzUCdE0Zdi8rxoVQiwk6pfRD94mVxM=; b=N6lSOdFlCxLd3kQJO/L/DOI3P8pPOPZL5alF1k+FAz/WpMJircSanATUcMz0+X36Q2 ZjxpEMTWeeUGRSaNJzDb2c7wvXfaWOmdEUb6DPTPzuuMinnZQv5pY9Bs0bU9OqYUMM7f vjaPHK8mKxp2aVg7ayQljfY5e6YCsn7f6HbtzrHCRWl/YPwrTILnzJBpgzKsf5F1SG7q rf1DHjGymY6JqmvJDxUXJBh7YbpE7+B4045VCOu87BI9gk14Y1xI035hFbJFoT2E9jjJ vvMyivYWO1A/s7L/hYNb2EoYtaLi2W2ZpdNw9NAn4Co/Ixy2DY4tw+hkK4POzdzF9YLP 6ydQ== X-Gm-Message-State: AOJu0YwHbMppr3PTtfibDjiPvASsXaZS0dxvzdM38NwCoxnNtY1uWMAu SohdIX/iHAnVCuDsR8cgcJXAWK6Y27QMwpOJ7m4CpoK53Vl0qUSM3meLeV2CHw== X-Gm-Gg: ASbGnct9ZLhUWJlpGLP390z2X2ZIx3/QVF9YbDiRhEU+2AgTF/MjGQap3plRja3ndzt BF6yJoNrG4UAy9sxzIL0UkwrON+oEYNcagy0Dgk4gB9fj7iHfzsYvTrf0wyX6PO58NQfPrkyn/F TEFWDFJbTSW/Htp/w9OzTyhm0AB79zM/+BNGmCis+iV/GA6SGdlZke3kAUoIY3FrCK7dMWkXKBO jexnIGlTkAQsfU6H4Kczk/isBtUoNkKd0OityAJgNm7pKEYHF6CAeyB1s9r66aqhIZ7cThzEKkm 3RzpPwJmDFcugkmZeQEx5AODQOWq3oM0LWci5q3RjWaRMLQcOFH7lKHyinAr05I3ONOQroy8SUu BDcHiv33KlgbUio7evlfeECc9qgMlyPZNv2acu0rMXelorV68YoYafWMPnoy2gCqgPIRhi9D6J3 b+/VsDIph4 X-Google-Smtp-Source: AGHT+IH47z3nmaqs3bbKm0yuJ/+GTMQ4rCLLofFrjLOqB3qWHSAF1u3b2CRV3ORVEwOAz0EquOCJaQ== X-Received: by 2002:a05:600c:c84:b0:477:8a29:582c with SMTP id 5b1f17b1804b1-4792f39d92cmr77413025e9.34.1764954700652; Fri, 05 Dec 2025 09:11:40 -0800 (PST) Received: from desktop ([51.154.145.205]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6db3sm98563435e9.1.2025.12.05.09.11.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 09:11:40 -0800 (PST) From: Gyorgy Sarvari To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][kirkstone][PATCH 08/10] xrdp: patch CVE-2022-23483 Date: Fri, 5 Dec 2025 18:11:32 +0100 Message-ID: <20251205171134.1346494-8-skandigraun@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251205171134.1346494-1-skandigraun@gmail.com> References: <20251205171134.1346494-1-skandigraun@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Dec 2025 17:11:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122354 Details: https://nvd.nist.gov/vuln/detail/CVE-2022-23483 Pick the patch that mentions this vulnerability explicitly. Signed-off-by: Gyorgy Sarvari --- .../xrdp/xrdp/CVE-2022-23483.patch | 65 +++++++++++++++++++ meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23483.patch diff --git a/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23483.patch b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23483.patch new file mode 100644 index 0000000000..7172a8264c --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23483.patch @@ -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 + +--- + 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; diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb index db191d5645..4902990272 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb @@ -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-2.patch \ file://CVE-2022-23481.patch \ + file://CVE-2022-23483.patch \ " SRC_URI[sha256sum] = "f76aa16034689bb8997e56fd554db29ba57caa1bab228a6eda28be4389dedeb9" From patchwork Fri Dec 5 17:11:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyorgy Sarvari X-Patchwork-Id: 75962 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03B4AD3399E for ; Fri, 5 Dec 2025 17:11:48 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.37.1764954702921552284 for ; Fri, 05 Dec 2025 09:11:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NcnBJP5/; spf=pass (domain: gmail.com, ip: 209.85.128.48, mailfrom: skandigraun@gmail.com) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4779d47be12so21595015e9.2 for ; Fri, 05 Dec 2025 09:11:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764954701; x=1765559501; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=42n/dX6AOn4spuQhV78qS0+F1SnrWwqvKMs9rLGI594=; b=NcnBJP5/skklrwT48bvx+cgZwAMwLEDYTJz9b0u038UmmanDCqvmrGRRqTv/5414HD emo0AyDdzHP/mcN7XvzSzo2minqH7lIyP8yj06n6v+jEyGlaCCXX5aP6gExK5E7RIb8O aGV9g69F9dDRNJLEencsUBh/uMc1GO9veE8KcDFGvKyUtTzLUzjnO1hzM/1fiU3NnGjX qiSUFc9vo5mKFeJ2niEdMkqertQU+SmeyPYvMmdXADfaQ8fB+2fJDRMq0aFFYJF60pXj wNwZcCtMPa8ut+TXU9V7cnzwQf1NjG3pfts/cWWg+p7vbMq+OmxqDkvhYDIoy04yZv5n dsdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764954701; x=1765559501; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=42n/dX6AOn4spuQhV78qS0+F1SnrWwqvKMs9rLGI594=; b=A/kC/kFg1uq6VqCkWjf+R2VNCLfCfT9vpcnY3mayWhL2IaFRRIlNrlAdxrdMoAe/1/ D0Orm0m+qFWTf0t7aYP5NEY4WNKwLHouI4HfZcgzlWX+Qq/scCzveMTdsg8b/fMlgwtB 1dhJUUgvd+dzynzdYbO+GA/QOYT1PG6cBEnzCU8SGOXaLDJffMahBjAirhbLITC4uUpK YA3VPfKeTvyH9hHpjZSJSYz3PNcCudu0wvixskr5X104Mkfgrziz0zdCrNjj4o0ldhbG stcSwNvDfScpDp6BKKTXKJV7fXJ6qbZh3rwHTjqP0PfHjJzpTMFMDaeAn4Fik+c9nd5K W/Gw== X-Gm-Message-State: AOJu0YzaiPQVLg2I0dB1gh5zhuHWCQp0VXUNxVku1F6z1oNVH4vbFYv7 w1LgcnCMttju/CjUbflNmK9ekxv42zby2NnX1f0WN0aU7UlBua6AkTSoRBMP8Q== X-Gm-Gg: ASbGncsvnc1AKGSZxy80i/QXiGDhD8t4ktdfU3xtpYi8RvMDYvT5Wp/4DNJ99uWz3gu tibFP8n4jkM8nrr5m+0/EawlET67asFk1iZCMrzyGn4V64+npVJY5kA3NydsY/jFb7C4SJ2/1Hi hfNk98you1Yc5MuLXJD8fD3x3O/qaUUzP6rVaZDzMsXnNrppBOyyROKi4vTfQ6TPvczmUXgTqwD 1PkqhpXzyeET2n6tH+/LMN8iIe6mgWCll1nvjuCl2TvzGzugozZDzOxgEVvb1whv9RzyZcYtYhf cH7NSvleiZjfqDcfon2GrzYKtQ/pg3A8ce81F+1yAVBkU780GIjYNzRf1tP4I4U3hSzDJD4LJxx cLFGZI+b++SgfYFS3fvpwaII52I/76lxn7beeYpnCMdFnDA5dnDcEt0wD93veFOUUduldYI+URw uENZpyLxkGx3esoY75rwI= X-Google-Smtp-Source: AGHT+IGGZCn8uOqVjNhZO82AJTiRyJRVErqm80eSisu5GmiUum/g4Mk6ngXyUKpMAPL9x0KCqj6LTw== X-Received: by 2002:a05:600c:1c10:b0:46f:b327:ecfb with SMTP id 5b1f17b1804b1-47939dfa487mr195295e9.9.1764954701246; Fri, 05 Dec 2025 09:11:41 -0800 (PST) Received: from desktop ([51.154.145.205]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6db3sm98563435e9.1.2025.12.05.09.11.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 09:11:40 -0800 (PST) From: Gyorgy Sarvari To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][kirkstone][PATCH 09/10] xrdp: patch CVE-2022-23484 Date: Fri, 5 Dec 2025 18:11:33 +0100 Message-ID: <20251205171134.1346494-9-skandigraun@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251205171134.1346494-1-skandigraun@gmail.com> References: <20251205171134.1346494-1-skandigraun@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Dec 2025 17:11:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122355 Details: https://nvd.nist.gov/vuln/detail/CVE-2022-23484 Pick the patch that mentions this vulnerability explicitly. Signed-off-by: Gyorgy Sarvari --- .../xrdp/xrdp/CVE-2022-23484.patch | 31 +++++++++++++++++++ meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23484.patch diff --git a/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23484.patch b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23484.patch new file mode 100644 index 0000000000..af27c50376 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23484.patch @@ -0,0 +1,31 @@ +From c2c6efb1d377be6baaa4acbc9d3700490fe92887 Mon Sep 17 00:00:00 2001 +From: matt335672 <30179339+matt335672@users.noreply.github.com> +Date: Wed, 7 Dec 2022 10:03:24 +0000 +Subject: [PATCH] CVE-2022-23484 + +Add check for RAIL window text size + +CVE: CVE-2022-23484 +Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/commit/c2c6efb1d377be6baaa4acbc9d3700490fe92887] +Signed-off-by: Gyorgy Sarvari +--- + xrdp/xrdp_mm.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c +index 74b0516afa..4352625874 100644 +--- a/xrdp/xrdp_mm.c ++++ b/xrdp/xrdp_mm.c +@@ -929,6 +929,12 @@ xrdp_mm_process_rail_update_window_text(struct xrdp_mm *self, struct stream *s) + + g_memset(&rwso, 0, sizeof(rwso)); + in_uint32_le(s, size); /* title size */ ++ if (size < 0 || !s_check_rem(s, size)) ++ { ++ LOG(LOG_LEVEL_ERROR, "%s : invalid window text size %d", ++ __func__, size); ++ return 1; ++ } + rwso.title_info = g_new(char, size + 1); + in_uint8a(s, rwso.title_info, size); + rwso.title_info[size] = 0; diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb index 4902990272..e78dba945d 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb @@ -23,6 +23,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN file://CVE-2022-23480-2.patch \ file://CVE-2022-23481.patch \ file://CVE-2022-23483.patch \ + file://CVE-2022-23484.patch \ " SRC_URI[sha256sum] = "f76aa16034689bb8997e56fd554db29ba57caa1bab228a6eda28be4389dedeb9" From patchwork Fri Dec 5 17:11:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyorgy Sarvari X-Patchwork-Id: 75960 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB57DD33992 for ; Fri, 5 Dec 2025 17:11:47 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.38.1764954703638115814 for ; Fri, 05 Dec 2025 09:11:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YDQf858p; spf=pass (domain: gmail.com, ip: 209.85.128.48, mailfrom: skandigraun@gmail.com) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-477632b0621so17217045e9.2 for ; Fri, 05 Dec 2025 09:11:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764954702; x=1765559502; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3oXfesDdKPXstCM620W+/7DfSh+9R6AoRJ8TQTGyVQU=; b=YDQf858pkj2OKM5MST2ABrOMpdhc16haIQDZ12MnEs/oKo6hGSO5skHmNLlDpWWTT+ BJkEN0Eae0ayo6VW9iOp1O6Tn2tXCIwS8bnabmyWUzWY0LZnnG17+vryWXPDpXCPwSo8 x5xIRwpeyOs5OZAvdKuz0m4Acm6fiWk3RHArL4tSrp9DES409ueXgWUOC2Jtmf3tziWE VRAqTta4yZPqUVNk1AuJm1nd6QiqjbbaNb3+cCI/OPRhC1zbsuj1DSgZzCyeyPgi8cdq RsZONY7SrrN/KISLp3bVujE+YLoTTJK5PNnSSQLkrDTe2/oO7TT5Ogh+jrmrsLcRgQNr rC5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764954702; x=1765559502; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=3oXfesDdKPXstCM620W+/7DfSh+9R6AoRJ8TQTGyVQU=; b=V6fntuzhNHm07zJwmlD83fawKbJPCbC0SDhwKMOL97QaXxspZb0k/RY4CSzyvpfOh5 JRDGnEY9aq2jXybSJADQ/Yrgp5UHH0nAqz3mrBiXIxfSQ7Ve1yOXrZmeF2skrAPQ+v0W WjDzCv4P+MtnZ4NEhMxoVaPKJiFX4NClm8xOrngvKyrnAGMf7dzbQ5znPJpqJJ7URDTU iJyNyfB3OjEuu/YDCrh+cZoWLCEmlaxfr/WiOis60vt3BncZKEIsOdsynXaNpJ2ttQpK eolePQfiLkkm28Royk7LvklhY7g3hNucKh5eLMo0zYH7NHpWS7n1/8IgG8Q8i91quHrK pMyA== X-Gm-Message-State: AOJu0YyB9+eGUANpRG9GMDpEm3hopCiZJ29zl3u6dBPD1JZtJAW07/eB 7AIxAwsxPnoKEzipIsttst3MdjQN6QMvsK2mkxw6Unt79ThDPoKYgXoll/2r/w== X-Gm-Gg: ASbGncvjuwgY6jkUlFwdyjr8tJvejGaAnDGSc0voF5Pqg8juvzHmjeYqlMI/l9Gg1Lt 2Lkr8vOm3XB1HdytuiiUX/Q0KsAxyeGNToCnnHgcGJv8ZRwef/Mfa+Wz2m0WkUts8RFfu3ftZI0 rr6H1Eu8xklEKk528U4p4LlPrFXeHjIRHNEKZL66Wzm3gGNCpqKXroVaVjVS6tVVE56UK+g+Unv 5bR38/kA3i9ts0aNJXl5teoAtxo1LuLpcySFAzTImmTCbNMdNJR8+1Rl6OFVQYm3Oo3RgV/9GMU lATGXo4D1lTFqQD902p0gxGwXG9pcflshqgUygzuRHWdUnaoYzDBAzw9iEuti15AY7yTdFgajG2 sE3MJJKvBfvTvXf0nWrmUg4uS9Vak5BqZKKcD9raHOWQhWZjZE1jbzeQxwJVEBqCd22qEmi7Zam Aju2Ql+vUp X-Google-Smtp-Source: AGHT+IGZr1oNrb1jDHHjK2Y5UZOkSQUZGsSwsoagU8+AD3Dp5ynx22px/V1Mj+quKr3ZQrISNEuneA== X-Received: by 2002:a05:600c:4ed3:b0:45d:f83b:96aa with SMTP id 5b1f17b1804b1-47939df12f6mr226205e9.7.1764954701850; Fri, 05 Dec 2025 09:11:41 -0800 (PST) Received: from desktop ([51.154.145.205]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-479310a6db3sm98563435e9.1.2025.12.05.09.11.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 09:11:41 -0800 (PST) From: Gyorgy Sarvari To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][kirkstone][PATCH 10/10] xrdp: patch CVE-2022-23493 Date: Fri, 5 Dec 2025 18:11:34 +0100 Message-ID: <20251205171134.1346494-10-skandigraun@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251205171134.1346494-1-skandigraun@gmail.com> References: <20251205171134.1346494-1-skandigraun@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Dec 2025 17:11:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122356 Details: https://nvd.nist.gov/vuln/detail/CVE-2022-23493 Pick the patch that mentions this vulnerability explicitly. Signed-off-by: Gyorgy Sarvari --- .../xrdp/xrdp/CVE-2022-23493.patch | 33 +++++++++++++++++++ meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23493.patch diff --git a/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23493.patch b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23493.patch new file mode 100644 index 0000000000..de3f7a42f3 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/CVE-2022-23493.patch @@ -0,0 +1,33 @@ +From 030db5524be7616967ae9e7d26b3d4477cf6082d Mon Sep 17 00:00:00 2001 +From: matt335672 <30179339+matt335672@users.noreply.github.com> +Date: Wed, 7 Dec 2022 10:49:06 +0000 +Subject: [PATCH] CVE-2022-23493 + +Check chansrv channel ID on a channel close + +Prevent OOB read if an invalid channel ID is sent. + +CVE: CVE-2022-23493 +Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/commit/030db5524be7616967ae9e7d26b3d4477cf6082d] +Signed-off-by: Gyorgy Sarvari +--- + xrdp/xrdp_mm.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c +index 74b0516afa..068424885e 100644 +--- a/xrdp/xrdp_mm.c ++++ b/xrdp/xrdp_mm.c +@@ -1435,6 +1435,12 @@ xrdp_mm_trans_process_drdynvc_channel_close(struct xrdp_mm *self, + return 1; + } + in_uint32_le(s, chansrv_chan_id); ++ if (chansrv_chan_id < 0 || chansrv_chan_id > 255) ++ { ++ LOG(LOG_LEVEL_ERROR, "Attempting to close invalid chansrv channel %d", ++ chansrv_chan_id); ++ return 1; ++ } + chan_id = self->cs2xr_cid_map[chansrv_chan_id]; + /* close dynamic channel */ + error = libxrdp_drdynvc_close(self->wm->session, chan_id); diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb index e78dba945d..5526027712 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.18.1.bb @@ -24,6 +24,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN file://CVE-2022-23481.patch \ file://CVE-2022-23483.patch \ file://CVE-2022-23484.patch \ + file://CVE-2022-23493.patch \ " SRC_URI[sha256sum] = "f76aa16034689bb8997e56fd554db29ba57caa1bab228a6eda28be4389dedeb9"