mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-13 17:39:57 +00:00
freerdp: patch CVE-2024-32658
Details: https://nvd.nist.gov/vuln/detail/CVE-2024-32658 Backport the patch that was marked to resolve this issue by the relevant Github advisory[1]. [1]: https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-vpv3-m3m9-4c2v Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
From 9b8628f014d14d85baeb0258d5558946603abc45 Mon Sep 17 00:00:00 2001
|
||||
From: akallabeth <akallabeth@posteo.net>
|
||||
Date: Sat, 20 Apr 2024 17:59:49 +0200
|
||||
Subject: [PATCH] fix offset error
|
||||
|
||||
(cherry picked from commit 1a755d898ddc028cc818d0dd9d49d5acff4c44bf)
|
||||
|
||||
CVE: CVE-2024-32658
|
||||
Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/2b9f30a2fa4b13559a367f7cbe158e1bafe0f482]
|
||||
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
|
||||
---
|
||||
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 58ddfbbfe..0c9e78fe0 100644
|
||||
--- a/libfreerdp/codec/interleaved.c
|
||||
+++ b/libfreerdp/codec/interleaved.c
|
||||
@@ -214,7 +214,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;
|
||||
@@ -284,7 +284,7 @@ static UINT ExtractRunLengthMegaMega(const BYTE* pbOrderHdr, const BYTE* pbEnd,
|
||||
assert((pbEnd) && "Assert failed: pbEnd");
|
||||
assert((advance) && "Assert failed: advance");
|
||||
|
||||
- if (!buffer_within_range(pbOrderHdr, 2, pbEnd))
|
||||
+ if (!buffer_within_range(pbOrderHdr, 3, pbEnd))
|
||||
{
|
||||
*advance = 0;
|
||||
return 0;
|
||||
@@ -37,6 +37,7 @@ SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;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"
|
||||
|
||||
Reference in New Issue
Block a user