diff --git a/CVE-2024-6564.patch b/CVE-2024-6564.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ed6dfdc1131dc6cdec1bfe5ff50b666b9b0a5add
--- /dev/null
+++ b/CVE-2024-6564.patch
@@ -0,0 +1,39 @@
+From c9fb3558410032d2660c7f3b7d4b87dec09fe2f2 Mon Sep 17 00:00:00 2001
+From: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
+Date: Mon, 3 Jul 2023 16:58:11 +0900
+Subject: [PATCH] rcar-gen3: plat: BL2: Fix to check "rcar_image_number"
+ variable before use
+
+Reviewed-by: Tomer Fichman <Tomer.Fichman@cymotive.com>
+Signed-off-by: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
+---
+ drivers/renesas/common/io/io_rcar.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/renesas/common/io/io_rcar.c b/drivers/renesas/common/io/io_rcar.c
+index b1638a1e0f..03a8f82126 100644
+--- a/drivers/renesas/common/io/io_rcar.c
++++ b/drivers/renesas/common/io/io_rcar.c
+@@ -496,17 +496,17 @@ static int32_t rcar_dev_init(io_dev_info_t *dev_info, const uintptr_t name)
+ #endif
+ 
+ 	rcar_image_number = header[0];
+-	for (i = 0; i < rcar_image_number + 2; i++) {
+-		rcar_image_header[i] = header[i * 2 + 1];
+-		rcar_image_header_prttn[i] = header[i * 2 + 2];
+-	}
+-
+ 	if (rcar_image_number == 0 || rcar_image_number > RCAR_MAX_BL3X_IMAGE) {
+ 		WARN("Firmware Image Package header check failed.\n");
+ 		rc = IO_FAIL;
+ 		goto error;
+ 	}
+ 
++	for (i = 0; i < rcar_image_number + 2; i++) {
++		rcar_image_header[i] = header[i * 2 + 1];
++		rcar_image_header_prttn[i] = header[i * 2 + 2];
++	}
++
+ 	rc = io_seek(handle, IO_SEEK_SET, offset + RCAR_SECTOR6_CERT_OFFSET);
+ 	if (rc != IO_SUCCESS) {
+ 		WARN("Firmware Image Package header failed to seek cert\n");
diff --git a/arm-trusted-firmware.spec b/arm-trusted-firmware.spec
index 87b20c6a951ff9fd7f906d8ae21d34a1a855a217..fb961eb6d9f135c0abeeac0a817b4c693f63449e 100644
--- a/arm-trusted-firmware.spec
+++ b/arm-trusted-firmware.spec
@@ -1,4 +1,4 @@
-%define anolis_release 3
+%define anolis_release 4
 
 %global debug_package %{nil}
 
@@ -17,7 +17,8 @@ Patch0002:  CVE-2022-47630-1.patch
 Patch0003:  CVE-2022-47630-2.patch
 # https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=f5c51855d36e399e
 Patch0004:  CVE-2022-47630-3.patch
-
+# https://github.com/renesas-rcar/arm-trusted-firmware/commit/c9fb3558410032d2660c7f3b7d4b87dec09fe2f2
+Patch0005:  CVE-2024-6564.patch
 ExclusiveArch: aarch64
 BuildRequires: gcc dtc
 
@@ -107,6 +108,9 @@ done
 %doc readme.rst
 
 %changelog
+* Wed Jul 09 2025 wenxin <wx02272781@alibaba-inc.com> - 2.8-4
+- Add patch to fix CVE-2024-6564
+
 * Wed Dec 04 2024 Zhongkun He <hezhongkun@inspur.com> - 2.8-3
 - Fix CVE-2022-47630