This is a note to let you know that I've just added the patch titled
x86/vdso: Fix rethunk patching for vdso-image-x32.o too
to the 6.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-vdso-fix-rethunk-patching-for-vdso-image-x32.o-too.patch
and it can be found in the queue-6.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4969d75dd9077e19e175e60f3c5a6c7653252e63 Mon Sep 17 00:00:00 2001
From: "Borislav Petkov (AMD)" <bp@xxxxxxxxx>
Date: Tue, 26 Mar 2024 10:47:14 +0100
Subject: x86/vdso: Fix rethunk patching for vdso-image-x32.o too
From: Borislav Petkov (AMD) <bp@xxxxxxxxx>
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@xxxxxxxxx>
Closes: https://lore.kernel.org/oe-lkp/202403251454.23df6278-lkp@xxxxxxxxx
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Link: https://lore.kernel.org/r/202403251454.23df6278-lkp@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/entry/vdso/Makefile | 1 +
1 file changed, 1 insertion(+)
--- 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
Patches currently in stable-queue which might be from bp@xxxxxxxxx are
queue-6.8/x86-vdso-fix-rethunk-patching-for-vdso-image-32-64-..patch
queue-6.8/x86-vdso-fix-rethunk-patching-for-vdso-image-x32.o-too.patch
