From d4ee9aa6cd3ed80593a832cab393c615b5723dfe Mon Sep 17 00:00:00 2001 From: Soby Mathew Date: Mon, 10 Sep 2018 11:32:49 +0100 Subject: [PATCH] CSS: Fix overrun if system power level is not available This patch fixes an array overrun in CSS scmi driver if the system power domain level is less than 2. This was reported from https://scan.coverity.com/projects/arm-software-arm-trusted-firmware CID 308492 Change-Id: I3a59c700490816718d20c71141281f19b2b7e7f7 Signed-off-by: Soby Mathew --- plat/arm/css/drivers/scp/css_pm_scmi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plat/arm/css/drivers/scp/css_pm_scmi.c b/plat/arm/css/drivers/scp/css_pm_scmi.c index cb39da27e..258c1c29c 100644 --- a/plat/arm/css/drivers/scp/css_pm_scmi.c +++ b/plat/arm/css/drivers/scp/css_pm_scmi.c @@ -105,8 +105,7 @@ void css_scp_suspend(const struct psci_power_state *target_state) * If we reach here, then assert that power down at system power domain * level is running. */ - assert(target_state->pwr_domain_state[CSS_SYSTEM_PWR_DMN_LVL] == - ARM_LOCAL_STATE_RUN); + assert(css_system_pwr_state(target_state) == ARM_LOCAL_STATE_RUN); /* For level 0, specify `scmi_power_state_sleep` as the power state */ SCMI_SET_PWR_STATE_LVL(scmi_pwr_state, ARM_PWR_LVL0, @@ -154,8 +153,7 @@ void css_scp_off(const struct psci_power_state *target_state) ARM_LOCAL_STATE_OFF); /* PSCI CPU OFF cannot be used to turn OFF system power domain */ - assert(target_state->pwr_domain_state[CSS_SYSTEM_PWR_DMN_LVL] == - ARM_LOCAL_STATE_RUN); + assert(css_system_pwr_state(target_state) == ARM_LOCAL_STATE_RUN); for (; lvl <= PLAT_MAX_PWR_LVL; lvl++) { if (target_state->pwr_domain_state[lvl] == ARM_LOCAL_STATE_RUN)