1*4882a593SmuzhiyunFrom da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Deepika Bhavnani <deepika.bhavnani@arm.com> 3*4882a593SmuzhiyunDate: Thu, 15 Aug 2019 00:56:46 +0300 4*4882a593SmuzhiyunSubject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunGCC diagnostics were added to ignore array boundaries, instead 7*4882a593Smuzhiyunof ignoring GCC warning current code will check for array boundaries 8*4882a593Smuzhiyunand perform and array update only for valid elements. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunResolves: `CID 246574` `CID 246710` `CID 246651` 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Deepika Bhavnani <deepika.bhavnani@arm.com> 13*4882a593SmuzhiyunChange-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunBackported from: 41af05154abe136938bcfb5f26c969933784bbef 16*4882a593Smuzhiyun[Adapted to apply on 1.5] 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun lib/psci/psci_common.c | 20 ++++++++++---------- 20*4882a593Smuzhiyun 1 file changed, 10 insertions(+), 10 deletions(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c 23*4882a593Smuzhiyunindex 2220a745cd6e..6282d992a2f0 100644 24*4882a593Smuzhiyun--- a/lib/psci/psci_common.c 25*4882a593Smuzhiyun+++ b/lib/psci/psci_common.c 26*4882a593Smuzhiyun@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void) 27*4882a593Smuzhiyun /****************************************************************************** 28*4882a593Smuzhiyun * Helper function to update the requested local power state array. This array 29*4882a593Smuzhiyun * does not store the requested state for the CPU power level. Hence an 30*4882a593Smuzhiyun- * assertion is added to prevent us from accessing the wrong index. 31*4882a593Smuzhiyun+ * assertion is added to prevent us from accessing the CPU power level. 32*4882a593Smuzhiyun *****************************************************************************/ 33*4882a593Smuzhiyun static void psci_set_req_local_pwr_state(unsigned int pwrlvl, 34*4882a593Smuzhiyun unsigned int cpu_idx, 35*4882a593Smuzhiyun plat_local_state_t req_pwr_state) 36*4882a593Smuzhiyun { 37*4882a593Smuzhiyun- /* 38*4882a593Smuzhiyun- * This should never happen, we have this here to avoid 39*4882a593Smuzhiyun- * "array subscript is above array bounds" errors in GCC. 40*4882a593Smuzhiyun- */ 41*4882a593Smuzhiyun assert(pwrlvl > PSCI_CPU_PWR_LVL); 42*4882a593Smuzhiyun-#pragma GCC diagnostic push 43*4882a593Smuzhiyun-#pragma GCC diagnostic ignored "-Warray-bounds" 44*4882a593Smuzhiyun- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state; 45*4882a593Smuzhiyun-#pragma GCC diagnostic pop 46*4882a593Smuzhiyun+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && 47*4882a593Smuzhiyun+ (cpu_idx < PLATFORM_CORE_COUNT)) { 48*4882a593Smuzhiyun+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state; 49*4882a593Smuzhiyun+ } 50*4882a593Smuzhiyun } 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun /****************************************************************************** 53*4882a593Smuzhiyun@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl, 54*4882a593Smuzhiyun { 55*4882a593Smuzhiyun assert(pwrlvl > PSCI_CPU_PWR_LVL); 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx]; 58*4882a593Smuzhiyun+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) && 59*4882a593Smuzhiyun+ (cpu_idx < PLATFORM_CORE_COUNT)) { 60*4882a593Smuzhiyun+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx]; 61*4882a593Smuzhiyun+ } else 62*4882a593Smuzhiyun+ return NULL; 63*4882a593Smuzhiyun } 64*4882a593Smuzhiyun 65*4882a593Smuzhiyun /* 66*4882a593Smuzhiyun-- 67*4882a593Smuzhiyun2.34.0 68*4882a593Smuzhiyun 69