diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-03-18 12:48:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-18 12:48:55 +0000 |
| commit | cc6864927d16c920365f5b3c852ee64fee47ac14 (patch) | |
| tree | dd9906f7b539ad7651d77088f058e5326065fa2a /lib | |
| parent | 73050e6970673ea1bd05a54dd9c3c3fe0ebf41f8 (diff) | |
| parent | 47102b35d644a8c5a1343f9ec05c29b5d1e0e1b0 (diff) | |
| download | platform_external_arm-trusted-firmware-cc6864927d16c920365f5b3c852ee64fee47ac14.tar.gz platform_external_arm-trusted-firmware-cc6864927d16c920365f5b3c852ee64fee47ac14.tar.bz2 platform_external_arm-trusted-firmware-cc6864927d16c920365f5b3c852ee64fee47ac14.zip | |
Merge pull request #1892 from sandrine-bailleux-arm/sb/pauth
Pointer authentication fixes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/el3_runtime/aarch64/context.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/el3_runtime/aarch64/context.S b/lib/el3_runtime/aarch64/context.S index 4371cb2b2..e6ab19bcc 100644 --- a/lib/el3_runtime/aarch64/context.S +++ b/lib/el3_runtime/aarch64/context.S @@ -356,7 +356,7 @@ func pauth_context_restore msr APIAKeyLo_EL1, x9 msr APIAKeyHi_EL1, x10 - ldp x9, x10, [x11, #CTX_PACIAKEY_LO] + ldp x9, x10, [x11, #CTX_PACIBKEY_LO] msr APIBKeyLo_EL1, x9 msr APIBKeyHi_EL1, x10 |