Skip to content

GitLab

Commit 3243cbf0 authored by Madhukar Pappireddy's avatar Madhukar Pappireddy Committed by TrustedFirmware Code Review
Browse files

Merge "lib: cpus: aarch32: sanity check pointers before use" into integration

parents 1d93ce63 e3b9cc12
Show whitespace changes
Inline Side-by-side
lib/cpus/aarch32/cpu_helpers.S
View file @ 3243cbf0
...@@ -78,6 +78,10 @@ func prepare_cpu_pwr_dwn ...@@ -78,6 +78,10 @@ func prepare_cpu_pwr_dwn
mov r1, #CPU_PWR_DWN_OPS mov r1, #CPU_PWR_DWN_OPS
add r1, r1, r2, lsl #2 add r1, r1, r2, lsl #2
ldr r1, [r0, r1] ldr r1, [r0, r1]
#if ENABLE_ASSERTIONS
cmp r1, #0
ASM_ASSERT(ne)
#endif
bx r1 bx r1
endfunc prepare_cpu_pwr_dwn endfunc prepare_cpu_pwr_dwn
...@@ -146,6 +150,10 @@ func get_cpu_ops_ptr ...@@ -146,6 +150,10 @@ func get_cpu_ops_ptr
/* Subtract the increment and offset to get the cpu-ops pointer */ /* Subtract the increment and offset to get the cpu-ops pointer */
sub r0, r4, #(CPU_OPS_SIZE + CPU_MIDR) sub r0, r4, #(CPU_OPS_SIZE + CPU_MIDR)
#if ENABLE_ASSERTIONS
cmp r0, #0
ASM_ASSERT(ne)
#endif
error_exit: error_exit:
bx lr bx lr
endfunc get_cpu_ops_ptr endfunc get_cpu_ops_ptr
...@@ -224,7 +232,15 @@ func print_errata_status ...@@ -224,7 +232,15 @@ func print_errata_status
* function. If it's non-NULL, jump to the function in turn. * function. If it's non-NULL, jump to the function in turn.
*/ */
bl _cpu_data bl _cpu_data
#if ENABLE_ASSERTIONS
cmp r0, #0
ASM_ASSERT(ne)
#endif
ldr r1, [r0, #CPU_DATA_CPU_OPS_PTR] ldr r1, [r0, #CPU_DATA_CPU_OPS_PTR]
#if ENABLE_ASSERTIONS
cmp r1, #0
ASM_ASSERT(ne)
#endif
ldr r0, [r1, #CPU_ERRATA_FUNC] ldr r0, [r1, #CPU_ERRATA_FUNC]
cmp r0, #0 cmp r0, #0
beq 1f beq 1f
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment