This is a note to let you know that I've just added the patch titled
um: Add missing apply_returns()
to the 5.18-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:
um-add-missing-apply_returns.patch
and it can be found in the queue-5.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 564d998106397394b6aad260f219b882b3347e62 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Date: Thu, 14 Jul 2022 12:20:19 +0200
Subject: um: Add missing apply_returns()
From: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
commit 564d998106397394b6aad260f219b882b3347e62 upstream.
Implement apply_returns() stub for UM, just like all the other patching
routines.
Fixes: 15e67227c49a ("x86: Undo return-thunk damage")
Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx)
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lore.kernel.org/r/Ys%2Ft45l%2FgarIrD0u@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/um/kernel/um_arch.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -432,6 +432,10 @@ void apply_retpolines(s32 *start, s32 *e
{
}
+void apply_returns(s32 *start, s32 *end)
+{
+}
+
void apply_alternatives(struct alt_instr *start, struct alt_instr *end)
{
}
Patches currently in stable-queue which might be from peterz@xxxxxxxxxxxxx are
queue-5.18/x86-bugs-add-amd-retbleed-boot-parameter.patch
queue-5.18/x86-bpf-use-alternative-ret-encoding.patch
queue-5.18/x86-retpoline-cleanup-some-ifdefery.patch
queue-5.18/x86-bugs-enable-stibp-for-jmp2ret.patch
queue-5.18/x86-speculation-fill-rsb-on-vmexit-for-ibrs.patch
queue-5.18/tools-arch-x86-sync-the-msr-index.h-copy-with-the-kernel-sources.patch
queue-5.18/x86-speculation-fix-firmware-entry-spec_ctrl-handling.patch
queue-5.18/x86-ftrace-use-alternative-ret-encoding.patch
queue-5.18/x86-retpoline-swizzle-retpoline-thunk.patch
queue-5.18/kvm-vmx-flatten-__vmx_vcpu_run.patch
queue-5.18/x86-speculation-add-spectre_v2-ibrs-option-to-support-kernel-ibrs.patch
queue-5.18/x86-entry-move-push_and_clear_regs-back-into-error_entry.patch
queue-5.18/objtool-re-add-unwind_hint_-save_restore.patch
queue-5.18/x86-bugs-add-retbleed-ibpb.patch
queue-5.18/tools-headers-cpufeatures-sync-with-the-kernel-sources.patch
queue-5.18/intel_idle-disable-ibrs-during-long-idle.patch
queue-5.18/objtool-update-retpoline-validation.patch
queue-5.18/kvm-vmx-fix-ibrs-handling-after-vmexit.patch
queue-5.18/kvm-vmx-prevent-rsb-underflow-before-vmenter.patch
queue-5.18/x86-bugs-optimize-spec_ctrl-msr-writes.patch
queue-5.18/x86-objtool-create-.return_sites.patch
queue-5.18/x86-kvm-fix-fastop_size-when-return-thunks-are-enabled.patch
queue-5.18/x86-xen-add-untrain_ret.patch
queue-5.18/x86-retpoline-use-mfunction-return.patch
queue-5.18/x86-bugs-keep-a-per-cpu-ia32_spec_ctrl-value.patch
queue-5.18/objtool-treat-.text.__x86.-as-noinstr.patch
queue-5.18/x86-add-magic-amd-return-thunk.patch
queue-5.18/x86-xen-rename-sys-entry-points.patch
queue-5.18/kvm-vmx-prevent-guest-rsb-poisoning-attacks-with-eibrs.patch
queue-5.18/x86-kvm-fix-setcc-emulation-for-return-thunks.patch
queue-5.18/x86-speculation-fix-spec_ctrl-write-on-smt-state-change.patch
queue-5.18/x86-use-return-thunk-in-asm-code.patch
queue-5.18/x86-bugs-split-spectre_v2_select_mitigation-and-spectre_v2_user_select_mitigation.patch
queue-5.18/x86-static_call-use-alternative-ret-encoding.patch
queue-5.18/x86-cpu-amd-add-spectral-chicken.patch
queue-5.18/x86-cpufeatures-move-retpoline-flags-to-word-11.patch
queue-5.18/x86-entry-avoid-very-early-ret.patch
queue-5.18/x86-vsyscall_emu-64-don-t-use-ret-in-vsyscall-emulation.patch
queue-5.18/x86-speculation-use-cached-host-spec_ctrl-value-for-guest-entry-exit.patch
queue-5.18/x86-bugs-report-amd-retbleed-vulnerability.patch
queue-5.18/efi-x86-use-naked-ret-on-mixed-mode-call-wrapper.patch
queue-5.18/x86-sev-avoid-using-__x86_return_thunk.patch
queue-5.18/x86-speculation-fix-rsb-filling-with-config_retpoline-n.patch
queue-5.18/x86-entry-remove-skip_r11rcx.patch
queue-5.18/x86-undo-return-thunk-damage.patch
queue-5.18/x86-common-stamp-out-the-stepping-madness.patch
queue-5.18/x86-bugs-report-intel-retbleed-vulnerability.patch
queue-5.18/um-add-missing-apply_returns.patch
queue-5.18/x86-kvm-vmx-make-noinstr-clean.patch
queue-5.18/x86-retbleed-add-fine-grained-kconfig-knobs.patch
queue-5.18/kvm-vmx-convert-launched-argument-to-flags.patch
queue-5.18/x86-entry-add-kernel-ibrs-implementation.patch
queue-5.18/objtool-add-entry-unret-validation.patch
