diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2020-04-27 09:00:07 -0700 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-05-15 16:35:45 +0100 |
| commit | d08b9f0ca6605e13dcb48f04e55a30545b3c71eb (patch) | |
| tree | 177893706ae16d9302dda4ee5f4894ac02e9b24e /init | |
| parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
| download | linux-stable-d08b9f0ca6605e13dcb48f04e55a30545b3c71eb.tar.gz linux-stable-d08b9f0ca6605e13dcb48f04e55a30545b3c71eb.tar.bz2 linux-stable-d08b9f0ca6605e13dcb48f04e55a30545b3c71eb.zip | |
scs: Add support for Clang's Shadow Call Stack (SCS)
This change adds generic support for Clang's Shadow Call Stack,
which uses a shadow stack to protect return addresses from being
overwritten by an attacker. Details are available here:
https://clang.llvm.org/docs/ShadowCallStack.html
Note that security guarantees in the kernel differ from the ones
documented for user space. The kernel must store addresses of
shadow stacks in memory, which means an attacker capable reading
and writing arbitrary memory may be able to locate them and hijack
control flow by modifying the stacks.
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
[will: Numerous cosmetic changes]
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/init_task.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/init/init_task.c b/init/init_task.c index bd403ed3e418..169e34066d35 100644 --- a/init/init_task.c +++ b/init/init_task.c @@ -11,6 +11,7 @@ #include <linux/mm.h> #include <linux/audit.h> #include <linux/numa.h> +#include <linux/scs.h> #include <asm/pgtable.h> #include <linux/uaccess.h> @@ -50,6 +51,13 @@ static struct sighand_struct init_sighand = { .signalfd_wqh = __WAIT_QUEUE_HEAD_INITIALIZER(init_sighand.signalfd_wqh), }; +#ifdef CONFIG_SHADOW_CALL_STACK +unsigned long init_shadow_call_stack[SCS_SIZE / sizeof(long)] + __init_task_data = { + [(SCS_SIZE / sizeof(long)) - 1] = SCS_END_MAGIC +}; +#endif + /* * Set up the first task table, touch at your own risk!. Base=0, * limit=0x1fffff (=2MB) |