1 From 4969d75dd9077e19e175e60f3c5a6c7653252e63 Mon Sep 17 00:00:00 2001
2 From: "Borislav Petkov (AMD)" <bp@alien8.de>
3 Date: Tue, 26 Mar 2024 10:47:14 +0100
4 Subject: x86/vdso: Fix rethunk patching for vdso-image-x32.o too
6 From: Borislav Petkov (AMD) <bp@alien8.de>
8 commit 4969d75dd9077e19e175e60f3c5a6c7653252e63 upstream.
10 In a similar fashion to
12 b388e57d4628 ("x86/vdso: Fix rethunk patching for vdso-image-{32,64}.o")
14 annotate vdso-image-x32.o too for objtool so that it gets annotated
15 properly and the unused return thunk warning doesn't fire.
17 Reported-by: kernel test robot <oliver.sang@intel.com>
18 Closes: https://lore.kernel.org/oe-lkp/202403251454.23df6278-lkp@intel.com
19 Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
20 Link: https://lore.kernel.org/r/202403251454.23df6278-lkp@intel.com
21 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
23 arch/x86/entry/vdso/Makefile | 1 +
24 1 file changed, 1 insertion(+)
26 --- a/arch/x86/entry/vdso/Makefile
27 +++ b/arch/x86/entry/vdso/Makefile
28 @@ -37,6 +37,7 @@ KCSAN_SANITIZE_vma.o := y
30 OBJECT_FILES_NON_STANDARD_extable.o := n
31 OBJECT_FILES_NON_STANDARD_vdso-image-32.o := n
32 +OBJECT_FILES_NON_STANDARD_vdso-image-x32.o := n
33 OBJECT_FILES_NON_STANDARD_vdso-image-64.o := n
34 OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n
35 OBJECT_FILES_NON_STANDARD_vma.o := n