Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
da74265810
!114 【轻量级 PR】:fix bad date in changelog
From: @zhangshaoning_uniontech 
Reviewed-by: @wk333 
Signed-off-by: @wk333
2024-06-17 01:00:48 +00:00
张少宁
590bc45e94
fix bad date in changelog
Signed-off-by: 张少宁 <zhangshaoning@uniontech.com>
2024-06-14 10:22:42 +00:00
openeuler-ci-bot
e00ff8f07b
!106 [sync] PR-104: Fix CVE-2024-32661
From: @openeuler-sync-bot 
Reviewed-by: @starlet-dx 
Signed-off-by: @starlet-dx
2024-05-07 01:13:17 +00:00
wk333
7e79bf0435 Fix CVE-2024-32661
(cherry picked from commit 4bddea79bbdd874d2512a3bac68ee2f10129ee82)
2024-05-06 16:54:21 +08:00
openeuler-ci-bot
fe6f62f6ff
!95 [sync] PR-93: Update changelog to mark CVE-2024-32658,CVE-2024-32659,CVE-2024-32660 as fixed
From: @openeuler-sync-bot 
Reviewed-by: @wk333 
Signed-off-by: @wk333
2024-04-24 02:36:31 +00:00
wk333
feab12862f Update changelog to mark CVE-2024-32658,CVE-2024-32659,CVE-2024-32660 as fixed
(cherry picked from commit 9278d444e5e2acd1d1e729ed72f3974ad52d60cd)
2024-04-24 10:34:26 +08:00
openeuler-ci-bot
b9c2f23ab1
!85 [sync] PR-83: Update to 2.11.7 and Fix CVE-2024-32039,CVE-2024-32040,CVE-2024-32041,CVE-2024-32458,CVE-2024-32459,CVE-2024-32460
From: @openeuler-sync-bot 
Reviewed-by: @wk333 
Signed-off-by: @wk333
2024-04-23 07:58:00 +00:00
wk333
4d4b1bdfdb Update to 2.11.7 and Fix CVE-2024-32039,CVE-2024-32040,CVE-2024-32041,CVE-2024-32458,CVE-2024-32459,CVE-2024-32460
(cherry picked from commit 107b29537ad2215b1aa3c0c1e186581f6393df89)
2024-04-23 14:38:18 +08:00
openeuler-ci-bot
7c1da667c3
!77 [sync] PR-75: Fix CVE-2024-22211
From: @openeuler-sync-bot 
Reviewed-by: @wk333 
Signed-off-by: @wk333
2024-01-25 01:00:39 +00:00
wk333
03298b2835 Fix CVE-2024-22211
(cherry picked from commit 0ff61789edcec9e0765b1bd7d14ff2b92e2254e2)
2024-01-24 14:34:26 +08:00
3 changed files with 40 additions and 3 deletions

25
CVE-2024-32661.patch Normal file
View File

@ -0,0 +1,25 @@
From 71e463e31b4d69f4022d36bfc814592f56600793 Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Sun, 21 Apr 2024 13:56:13 +0200
Subject: [PATCH] [core,info] fix missing check in rdp_write_logon_info_v1
Origin: https://github.com/FreeRDP/FreeRDP/commit/71e463e31b4d69f4022d36bfc814592f56600793
---
libfreerdp/core/info.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/libfreerdp/core/info.c
+++ b/libfreerdp/core/info.c
@@ -1322,6 +1322,10 @@ static BOOL rdp_write_logon_info_v1(wStr
return FALSE;
/* domain */
+ WINPR_ASSERT(info);
+ if (!info->domain || !info->username)
+ return FALSE;
+
ilen = ConvertToUnicode(CP_UTF8, 0, info->domain, -1, &wString, 0);
if (ilen < 0)

View File

@ -1,6 +1,6 @@
Name: freerdp
Version: 2.11.1
Release: 1
Version: 2.11.7
Release: 2
Epoch: 2
Summary: A Remote Desktop Protocol Implementation
License: Apache-2.0
@ -8,6 +8,7 @@ URL: http://www.freerdp.com
Source0: https://github.com/FreeRDP/FreeRDP/releases/download/%{version}/freerdp-%{version}.tar.gz
Patch0001: Fix-freerdp-shadow-cli-exit-codes-for-help-and-version.patch
Patch0002: CVE-2024-32661.patch
BuildRequires: gcc gcc-c++ alsa-lib-devel cmake >= 2.8 cups-devel gsm-devel libXrandr-devel libXv-devel
BuildRequires: libjpeg-turbo-devel libjpeg-turbo-devel libX11-devel libXcursor-devel libxkbfile-devel
@ -137,6 +138,17 @@ echo "%{_libdir}/freerdp2" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_
%{_mandir}/*/*
%changelog
* Mon May 06 2024 wangkai <13474090681@163.com> - 2:2.11.7-2
- Fix CVE-2024-32661
* Tue Apr 23 2024 wangkai <13474090681@163.com> - 2:2.11.7-1
- Update to 2.11.7 for fix CVE-2024-32039,CVE-2024-32040,
CVE-2024-32041,CVE-2024-32458,CVE-2024-32459,CVE-2024-32460,
CVE-2024-32658,CVE-2024-32659 and CVE-2024-32660
* Wed Jan 24 2024 wangkai <13474090681@163.com> - 2:2.11.1-2
- Fix CVE-2024-22211
* Wed Sep 06 2023 Funda Wang <fundawang@yeah.net> - 2:2.11.1-1
- 2.11.1
- Fix CVE-2023-40567
@ -186,7 +198,7 @@ echo "%{_libdir}/freerdp2" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_
- SUG: NA
- DESC: update to 2.2.0 to fix cves, fix changelog version
* Aug 21 2020 yuboyun <yuboyun@huawei.com> - 2:2.0.0-46.rc3
* Fri Aug 21 2020 yuboyun <yuboyun@huawei.com> - 2:2.0.0-46.rc3
- Type: bugfix
- ID: NA
- SUG: NA