Merge pull request #1901 from AlexeiFedorov/af/restore_pauth_context_smc

Restore PAuth context in case of unknown SMC call

Merge pull request #1901 from AlexeiFedorov/af/restore_pauth_context_smc
Restore PAuth context in case of unknown SMC call
5e5c77db · Dimitris Papastamos · GitHub · 859cf9ea · 317d68e9 · 5e5c77db
Unverified Commit 5e5c77db authored 6 years ago by Dimitris Papastamos Committed by GitHub 6 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 0 deletions
+3 -0
--- a/bl31/aarch64/runtime_exceptions.S
+++ b/bl31/aarch64/runtime_exceptions.S
@@ -419,6 +419,9 @@ smc_unknown:
 	 */
 	mov	x0, #SMC_UNK
 	str	x0, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X0]
+#if CTX_INCLUDE_PAUTH_REGS
+	bl	pauth_context_save
+#endif
 	b	restore_gp_registers_eret

 smc_prohibited: