From 95d7b8e7d59eceb4c206011d2ea5c537c2b52e8f Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Sat, 11 Oct 2025 20:13:35 +0200 Subject: [PATCH] freerdp3: patch CVE-2024-32658 Details: https://nvd.nist.gov/vuln/detail/CVE-2024-32658 Pick the commit that is marked to resolve the related github advisory. Signed-off-by: Gyorgy Sarvari Signed-off-by: Anuj Mittal --- .../freerdp/freerdp3/CVE-2024-32658.patch | 35 +++++++++++++++++++ .../recipes-support/freerdp/freerdp3_3.4.0.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-oe/recipes-support/freerdp/freerdp3/CVE-2024-32658.patch diff --git a/meta-oe/recipes-support/freerdp/freerdp3/CVE-2024-32658.patch b/meta-oe/recipes-support/freerdp/freerdp3/CVE-2024-32658.patch new file mode 100644 index 0000000000..6af8867a6c --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp3/CVE-2024-32658.patch @@ -0,0 +1,35 @@ +From f489a734d2c06eb4adee654919455799e4cb8c01 Mon Sep 17 00:00:00 2001 +From: akallabeth +Date: Sat, 20 Apr 2024 17:59:49 +0200 +Subject: [PATCH] fix offset error + +CVE: CVE-2024-32658 +Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/1a755d898ddc028cc818d0dd9d49d5acff4c44bf] + +Signed-off-by: Gyorgy Sarvari +--- + libfreerdp/codec/interleaved.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c +index df148b667..08520e55e 100644 +--- a/libfreerdp/codec/interleaved.c ++++ b/libfreerdp/codec/interleaved.c +@@ -212,7 +212,7 @@ static UINT ExtractRunLengthRegularFgBg(const BYTE* pbOrderHdr, const BYTE* pbEn + runLength = (*pbOrderHdr) & g_MaskRegularRunLength; + if (runLength == 0) + { +- if (!buffer_within_range(pbOrderHdr, 1, pbEnd)) ++ if (!buffer_within_range(pbOrderHdr, 2, pbEnd)) + { + *advance = 0; + return 0; +@@ -282,7 +282,7 @@ static UINT ExtractRunLengthMegaMega(const BYTE* pbOrderHdr, const BYTE* pbEnd, + WINPR_ASSERT(pbEnd); + WINPR_ASSERT(advance); + +- if (!buffer_within_range(pbOrderHdr, 2, pbEnd)) ++ if (!buffer_within_range(pbOrderHdr, 3, pbEnd)) + { + *advance = 0; + return 0; diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb index fd9df18b43..f71cc06ebd 100644 --- a/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb +++ b/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https \ file://CVE-2024-32458.patch \ file://CVE-2024-32459.patch \ file://CVE-2024-32460.patch \ + file://CVE-2024-32658.patch \ " S = "${WORKDIR}/git"