Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
3243cbf0
Commit
3243cbf0
authored
Feb 23, 2021
by
Madhukar Pappireddy
Committed by
TrustedFirmware Code Review
Feb 23, 2021
Browse files
Merge "lib: cpus: aarch32: sanity check pointers before use" into integration
parents
1d93ce63
e3b9cc12
Changes
1
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
mov
r1
,
#
CPU_PWR_DWN_OPS
add
r1
,
r1
,
r2
,
lsl
#
2
ldr
r1
,
[
r0
,
r1
]
#if ENABLE_ASSERTIONS
cmp
r1
,
#
0
ASM_ASSERT
(
ne
)
#endif
bx
r1
endfunc
prepare_cpu_pwr_dwn
...
...
@@ -146,6 +150,10 @@ func get_cpu_ops_ptr
/
*
Subtract
the
increment
and
offset
to
get
the
cpu
-
ops
pointer
*/
sub
r0
,
r4
,
#(
CPU_OPS_SIZE
+
CPU_MIDR
)
#if ENABLE_ASSERTIONS
cmp
r0
,
#
0
ASM_ASSERT
(
ne
)
#endif
error_exit
:
bx
lr
endfunc
get_cpu_ops_ptr
...
...
@@ -224,7 +232,15 @@ func print_errata_status
*
function
.
If
it
's non-NULL, jump to the function in turn.
*/
bl
_cpu_data
#if ENABLE_ASSERTIONS
cmp
r0
,
#
0
ASM_ASSERT
(
ne
)
#endif
ldr
r1
,
[
r0
,
#
CPU_DATA_CPU_OPS_PTR
]
#if ENABLE_ASSERTIONS
cmp
r1
,
#
0
ASM_ASSERT
(
ne
)
#endif
ldr
r0
,
[
r1
,
#
CPU_ERRATA_FUNC
]
cmp
r0
,
#
0
beq
1
f
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment