summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov (AMD) <bp@alien8.de>2024-03-26 10:47:14 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-13 13:10:12 +0200
commitdd0ad4883ce485d2b1c25fd5307919796bd04cab (patch)
treec30350648d378701f12633f502c0f9b879bc4dda
parentf4bcada30920721420b075f6e21e02f2d12ff76c (diff)
downloadlinux-stable-dd0ad4883ce485d2b1c25fd5307919796bd04cab.tar.gz
linux-stable-dd0ad4883ce485d2b1c25fd5307919796bd04cab.tar.bz2
linux-stable-dd0ad4883ce485d2b1c25fd5307919796bd04cab.zip
x86/vdso: Fix rethunk patching for vdso-image-x32.o too
commit 4969d75dd9077e19e175e60f3c5a6c7653252e63 upstream. In a similar fashion to b388e57d4628 ("x86/vdso: Fix rethunk patching for vdso-image-{32,64}.o") annotate vdso-image-x32.o too for objtool so that it gets annotated properly and the unused return thunk warning doesn't fire. Reported-by: kernel test robot <oliver.sang@intel.com> Closes: https://lore.kernel.org/oe-lkp/202403251454.23df6278-lkp@intel.com Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/202403251454.23df6278-lkp@intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/entry/vdso/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 4ee59121b905..73ac5adb0b4c 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -37,6 +37,7 @@ KCSAN_SANITIZE_vma.o := y
OBJECT_FILES_NON_STANDARD_extable.o := n
OBJECT_FILES_NON_STANDARD_vdso-image-32.o := n
+OBJECT_FILES_NON_STANDARD_vdso-image-x32.o := n
OBJECT_FILES_NON_STANDARD_vdso-image-64.o := n
OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n
OBJECT_FILES_NON_STANDARD_vma.o := n