From ee9265dada957f833421bd0e72a4e1d527c1c4ff Mon Sep 17 00:00:00 2001
From: Ankur Tyagi <ankur.tyagi85@gmail.com>
Date: Wed, 9 Sep 2026 20:31:36 +1200
Subject: [PATCH] freerdp3: patch CVE-2026-64621

Backport commit matching GitHub advisory[1]

Details:
https://nvd.nist.gov/vuln/detail/cve-2026-64621

[1]https://github.com/FreeRDP/FreeRDP/security/advisories/GHSA-f27x-frr8-j9hc

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
Signed-off-by: Anuj Mittal <anuj.mittal@oss.qualcomm.com>
---
 .../freerdp/freerdp3/CVE-2026-64621.patch     | 27 +++++++++++++++++++
 .../freerdp/freerdp3_3.24.2.bb                |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 meta-oe/recipes-support/freerdp/freerdp3/CVE-2026-64621.patch

diff --git a/meta-oe/recipes-support/freerdp/freerdp3/CVE-2026-64621.patch b/meta-oe/recipes-support/freerdp/freerdp3/CVE-2026-64621.patch
new file mode 100644
index 0000000000..4fbc7abf4c
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp3/CVE-2026-64621.patch
@@ -0,0 +1,27 @@
+From b33dbe41020a6227ad3e89285c27e25e3f8617e9 Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin.novak@thincast.com>
+Date: Wed, 1 Jul 2026 23:03:29 +0200
+Subject: [PATCH] [client,common] fix double free
+
+(cherry picked from commit 7696267929ae8ba045c1bbe275b3915653828313)
+
+CVE: CVE-2026-64621
+Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/7696267929ae8ba045c1bbe275b3915653828313]
+
+Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
+---
+ client/common/file.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/client/common/file.c b/client/common/file.c
+index 9fe207731..1ddf9f0ae 100644
+--- a/client/common/file.c
++++ b/client/common/file.c
+@@ -2533,7 +2533,6 @@ BOOL freerdp_client_populate_settings_from_rdp_file_unchecked(const rdpFile* fil
+ 			if ((val >= UINT32_MAX) && (errno != 0))
+ 			{
+ 				CommandLineParserFree(ptr);
+-				free(list);
+ 				return FALSE;
+ 			}
+ 			list[x] = (UINT32)val;
diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.24.2.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.24.2.bb
index a577916bef..493fa94c4c 100644
--- a/meta-oe/recipes-support/freerdp/freerdp3_3.24.2.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp3_3.24.2.bb
@@ -22,6 +22,7 @@ SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;nobranch=1;protocol=https;tag=${
            file://CVE-2026-63633.patch \
            file://CVE-2026-63652.patch \
            file://CVE-2026-64620.patch \
+           file://CVE-2026-64621.patch \
 "