[PATCH v3 12/16] arm64: suspend: restore the kernel ptrauth keys

Catalin Marinas catalin.marinas at arm.com
Fri Jan 17 02:31:38 PST 2020


On Mon, Dec 16, 2019 at 02:17:14PM +0530, Amit Daniel Kachhap wrote:
> diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S
> index 7b2f2e6..a6e9460 100644
> --- a/arch/arm64/kernel/sleep.S
> +++ b/arch/arm64/kernel/sleep.S
> @@ -2,6 +2,7 @@
>  #include <linux/errno.h>
>  #include <linux/linkage.h>
>  #include <asm/asm-offsets.h>
> +#include <asm/asm_pointer_auth.h>
>  #include <asm/assembler.h>
>  #include <asm/smp.h>
>  
> @@ -139,6 +140,11 @@ ENTRY(_cpu_resume)
>  	bl	kasan_unpoison_task_stack_below
>  #endif
>  
> +#ifdef CONFIG_ARM64_PTR_AUTH
> +	get_current_task x1
> +	ptrauth_keys_install_kernel x1, x2, x3, x4
> +#endif

We should initialise the keys earlier since
kasan_unpoison_task_stack_below() is a C function.

-- 
Catalin



More information about the linux-arm-kernel mailing list