francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
30 lines
941 B
Diff
30 lines
941 B
Diff
From f29088d17903aa8e58073b9811dc8a72f94cf4fb Mon Sep 17 00:00:00 2001
|
|
From: akallabeth <akallabeth@posteo.net>
|
|
Date: Tue, 16 Apr 2024 08:26:37 +0200
|
|
Subject: [PATCH] fix missing check
|
|
|
|
in nsc_rle_decode abort if there are more bytes to be read then there
|
|
are left.
|
|
|
|
CVE: CVE-2024-32040
|
|
Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/d58cbc96aced4d082abf92b41a415a891c7ea309]
|
|
|
|
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
|
|
---
|
|
libfreerdp/codec/nsc.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/libfreerdp/codec/nsc.c b/libfreerdp/codec/nsc.c
|
|
index 049b541f1..c2d92e48c 100644
|
|
--- a/libfreerdp/codec/nsc.c
|
|
+++ b/libfreerdp/codec/nsc.c
|
|
@@ -160,7 +160,7 @@ static BOOL nsc_rle_decode(const BYTE* in, size_t inSize, BYTE* out, UINT32 outS
|
|
len |= ((UINT32)(*in++)) << 24U;
|
|
}
|
|
|
|
- if (outSize < len)
|
|
+ if ((outSize < len) || (left < len))
|
|
return FALSE;
|
|
|
|
outSize -= len;
|