commit dc210680eb430f1f2c2238e418653a07bf10dbdf
author Joanna Farley <joanna.farley@arm.com> Mon Aug 21 09:52:22 2023 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Mon Aug 21 09:52:22 2023 +0200
tree 7e3ed60b0afa49d83ef8b70cf1dbe3d853e8c9a8
parent 085dd0b0909c148a8e1a76ec8822a9443d5e5f4e
parent 13e01583a088d198d5b5701c4717ea1150e684d5

Merge "fix(zynqmp): validate clock_id to avoid OOB variable access" into integration

plat/xilinx/zynqmp/pm_service/pm_api_clock.c

diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.c b/plat/xilinx/zynqmp/pm_service/pm_api_clock.c
index 2041541..9682e59 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.c
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.c
@@ -2458,7 +2458,7 @@
 	if (clock_id == CLK_MAX) {
 		memcpy(name, END_OF_CLK, sizeof(END_OF_CLK) > CLK_NAME_LEN ?
 					 CLK_NAME_LEN : sizeof(END_OF_CLK));
-	} else if (!pm_clock_valid(clock_id)) {
+	} else if ((clock_id > CLK_MAX) || (!pm_clock_valid(clock_id))) {
 		memset(name, 0, CLK_NAME_LEN);
 	} else if (clock_id < CLK_MAX_OUTPUT_CLK) {
 		memcpy(name, clocks[clock_id].name, CLK_NAME_LEN);