From 8e26307db63b1da1029713ba5d22b3428a2dab4b Mon Sep 17 00:00:00 2001 From: Nariman Poushin Date: Tue, 1 May 2018 13:07:47 +0100 Subject: [PATCH] plat/arm: css: Sanitize the input to css_validate_power_state In the case of the platform max power level being less than the system power level, make sure to not overrun the array of power states. This fixes Coverity Scan OVERRUN defect CID 267021. Change-Id: I52646ab9be2fceeb5c331b5dad7a6267991f4197 Signed-off-by: Nariman Poushin --- plat/arm/css/common/css_pm.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/plat/arm/css/common/css_pm.c b/plat/arm/css/common/css_pm.c index 986cb0846..4735a9dcc 100644 --- a/plat/arm/css/common/css_pm.c +++ b/plat/arm/css/common/css_pm.c @@ -263,12 +263,24 @@ static int css_validate_power_state(unsigned int power_state, int rc; rc = arm_validate_power_state(power_state, req_state); + /* + * Ensure that we don't overrun the pwr_domain_state array in the case + * where the platform supported max power level is less than the system + * power level + */ + +#if (PLAT_MAX_PWR_LVL == CSS_SYSTEM_PWR_DMN_LVL) + /* * Ensure that the system power domain level is never suspended * via PSCI CPU SUSPEND API. Currently system suspend is only * supported via PSCI SYSTEM SUSPEND API. */ - req_state->pwr_domain_state[CSS_SYSTEM_PWR_DMN_LVL] = ARM_LOCAL_STATE_RUN; + + req_state->pwr_domain_state[CSS_SYSTEM_PWR_DMN_LVL] = + ARM_LOCAL_STATE_RUN; +#endif + return rc; }