[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1594613013-13059-1-git-send-email-guoren@kernel.org>
Date: Mon, 13 Jul 2020 04:03:33 +0000
From: guoren@...nel.org
To: catalin.marinas@....com, will@...nel.org
Cc: linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-csky@...r.kernel.org, Guo Ren <guoren@...ux.alibaba.com>
Subject: [PATCH] arm64: Make TSK_STACK_CANARY more accurate defined
From: Guo Ren <guoren@...ux.alibaba.com>
TSK_STACK_CANARY only used in arm64/Makefile with
CONFIG_STACKPROTECTOR_PER_TASK wrap. So use the same policy in
asm-offset.c.
Signed-off-by: Guo Ren <guoren@...ux.alibaba.com>
Co-developed-by: Kees Cook <keescook@...omium.org>
Cc: Catalin Marinas <catalin.marinas@....com>
Cc: Will Deacon <will@...nel.org>
---
arch/arm64/kernel/asm-offsets.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index 0577e21..37d5d3d 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -39,7 +39,7 @@ int main(void)
DEFINE(TSK_TI_SCS_SP, offsetof(struct task_struct, thread_info.scs_sp));
#endif
DEFINE(TSK_STACK, offsetof(struct task_struct, stack));
-#ifdef CONFIG_STACKPROTECTOR
+#ifdef CONFIG_STACKPROTECTOR_PER_TASK
DEFINE(TSK_STACK_CANARY, offsetof(struct task_struct, stack_canary));
#endif
BLANK();
--
2.7.4
Powered by blists - more mailing lists