Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1649731
| From | riel@redhat.com |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 3/5] x86: ascii armor the x86_64 boot init stack canary |
| Date | 2017-05-24 18:00 +0200 |
| Message-ID | <tKGRA-4dh-23@gated-at.bofh.it> (permalink) |
| References | <tKGRz-4dh-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Rik van Riel <riel@redhat.com> Use the ascii-armor canary to prevent unterminated C string overflows from being able to successfully overwrite the canary, even if they somehow obtain the canary value. Inspired by execshield ascii-armor and Daniel Micay's linux-hardened tree. Signed-off-by: Rik van Riel <riel@redhat.com> --- arch/x86/include/asm/stackprotector.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h index dcbd9bcce714..8abedf1d650e 100644 --- a/arch/x86/include/asm/stackprotector.h +++ b/arch/x86/include/asm/stackprotector.h @@ -74,6 +74,7 @@ static __always_inline void boot_init_stack_canary(void) get_random_bytes(&canary, sizeof(canary)); tsc = rdtsc(); canary += tsc + (tsc << 32UL); + canary &= CANARY_MASK; current->stack_canary = canary; #ifdef CONFIG_X86_64 -- 2.9.3
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 0/5] stackprotector: ascii armor the stack canary riel@redhat.com - 2017-05-24 18:00 +0200
[PATCH 1/5] random,stackprotect: introduce get_random_canary function riel@redhat.com - 2017-05-24 18:00 +0200
Re: [PATCH 1/5] random,stackprotect: introduce get_random_canary function Kees Cook <keescook@google.com> - 2017-05-24 18:20 +0200
[PATCH 4/5] arm64: ascii armor the arm64 boot init stack canary riel@redhat.com - 2017-05-24 18:00 +0200
Re: [PATCH 4/5] arm64: ascii armor the arm64 boot init stack canary Kees Cook <keescook@google.com> - 2017-05-24 18:20 +0200
[PATCH 3/5] x86: ascii armor the x86_64 boot init stack canary riel@redhat.com - 2017-05-24 18:00 +0200
Re: [PATCH 3/5] x86: ascii armor the x86_64 boot init stack canary Kees Cook <keescook@google.com> - 2017-05-24 18:20 +0200
[PATCH 2/5] fork,random: use get_random_canary to set tsk->stack_canary riel@redhat.com - 2017-05-24 18:00 +0200
Re: [PATCH 2/5] fork,random: use get_random_canary to set tsk->stack_canary Kees Cook <keescook@google.com> - 2017-05-24 18:20 +0200
[PATCH 5/5] sh64: ascii armor the sh64 boot init stack canary Rik van Riel <riel@redhat.com> - 2017-05-24 18:40 +0200
Re: [PATCH 5/5] sh64: ascii armor the sh64 boot init stack canary Kees Cook <keescook@google.com> - 2017-05-24 18:40 +0200
[PATCH 5/5] sh64: ascii armor the sh64 boot init stack canary riel@redhat.com - 2017-05-24 18:50 +0200
csiph-web