diff options
author | Peter Zijlstra <peterz@infradead.org> | 2023-08-14 13:44:28 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-26 13:26:59 +0200 |
commit | 8bb1ed390d358f6c167f45a27305b775aa8fc898 (patch) | |
tree | 33f28e261bda0d5417e9a47870d19c92fab8c60d /scripts/checksyscalls.sh | |
parent | 6e4dd7d2636d8e8fb634cc9e7fc84eb13928e88a (diff) | |
download | linux-8bb1ed390d358f6c167f45a27305b775aa8fc898.tar.gz |
x86/cpu: Fix up srso_safe_ret() and __x86_return_thunk()
commit af023ef335f13c8b579298fc432daeef609a9e60 upstream. vmlinux.o: warning: objtool: srso_untrain_ret() falls through to next function __x86_return_skl() vmlinux.o: warning: objtool: __x86_return_thunk() falls through to next function __x86_return_skl() This is because these functions (can) end with CALL, which objtool does not consider a terminating instruction. Therefore, replace the INT3 instruction (which is a non-fatal trap) with UD2 (which is a fatal-trap). This indicates execution will not continue past this point. Fixes: fb3bd914b3ec ("x86/srso: Add a Speculative RAS Overflow mitigation") Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20230814121148.637802730@infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/checksyscalls.sh')
0 files changed, 0 insertions, 0 deletions