diff options
| author | Borislav Petkov <bp@suse.de> | 2022-01-27 12:56:23 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2022-04-04 10:16:57 +0200 |
| commit | dbae0a934f09208075ec3e73491bd0844e1397b3 (patch) | |
| tree | ad673206368782f4db7edb97bcc23ad9497cf20a /scripts/link-vmlinux.sh | |
| parent | c949110ef4e31cb5d3387bd8273fd5de66b5227b (diff) | |
| download | lwn-dbae0a934f09208075ec3e73491bd0844e1397b3.tar.gz lwn-dbae0a934f09208075ec3e73491bd0844e1397b3.zip | |
x86/cpu: Remove CONFIG_X86_SMAP and "nosmap"
Those were added as part of the SMAP enablement but SMAP is currently
an integral part of kernel proper and there's no need to disable it
anymore.
Rip out that functionality. Leave --uaccess default on for objtool as
this is what objtool should do by default anyway.
If still needed - clearcpuid=smap.
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220127115626.14179-4-bp@alien8.de
Diffstat (limited to 'scripts/link-vmlinux.sh')
| -rwxr-xr-x | scripts/link-vmlinux.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 20f44504a644..3a2fffdf49d4 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -146,9 +146,9 @@ objtool_link() if is_enabled CONFIG_RETPOLINE; then objtoolopt="${objtoolopt} --retpoline" fi - if is_enabled CONFIG_X86_SMAP; then - objtoolopt="${objtoolopt} --uaccess" - fi + + objtoolopt="${objtoolopt} --uaccess" + if is_enabled CONFIG_SLS; then objtoolopt="${objtoolopt} --sls" fi |