# git rev-parse -q --verify 4535e1a4174c4111d92c5a9a21e542d232e0fcaa^{commit} 4535e1a4174c4111d92c5a9a21e542d232e0fcaa already have revision, skipping fetch # git checkout -q -f -B kisskb 4535e1a4174c4111d92c5a9a21e542d232e0fcaa # git clean -qxdf # < git log -1 # commit 4535e1a4174c4111d92c5a9a21e542d232e0fcaa # Author: Borislav Petkov (AMD) # Date: Thu Mar 28 13:59:05 2024 +0100 # # x86/bugs: Fix the SRSO mitigation on Zen3/4 # # The original version of the mitigation would patch in the calls to the # untraining routines directly. That is, the alternative() in UNTRAIN_RET # will patch in the CALL to srso_alias_untrain_ret() directly. # # However, even if commit e7c25c441e9e ("x86/cpu: Cleanup the untrain # mess") meant well in trying to clean up the situation, due to micro- # architectural reasons, the untraining routine srso_alias_untrain_ret() # must be the target of a CALL instruction and not of a JMP instruction as # it is done now. # # Reshuffle the alternative macros to accomplish that. # # Fixes: e7c25c441e9e ("x86/cpu: Cleanup the untrain mess") # Signed-off-by: Borislav Petkov (AMD) # Reviewed-by: Ingo Molnar # Cc: stable@kernel.org # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/arc-linux/bin/arc-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/arc-linux/bin/arc-linux-ld --version # < git log --format=%s --max-count=1 4535e1a4174c4111d92c5a9a21e542d232e0fcaa # make -s -j 160 ARCH=arc O=/kisskb/build/linus_axs103_smp_defconfig_arc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/arc-linux/bin/arc-linux- axs103_smp_defconfig # Added to kconfig CONFIG_INITRAMFS_SOURCE="" # < make -s -j 160 ARCH=arc O=/kisskb/build/linus_axs103_smp_defconfig_arc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/arc-linux/bin/arc-linux- help # make -s -j 160 ARCH=arc O=/kisskb/build/linus_axs103_smp_defconfig_arc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/arc-linux/bin/arc-linux- olddefconfig # make -s -j 160 ARCH=arc O=/kisskb/build/linus_axs103_smp_defconfig_arc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/arc-linux/bin/arc-linux- /kisskb/src/arch/arc/boot/dts/axc003_idu.dtsi:92.16-97.5: Warning (interrupt_provider): /cpu_card/pct: '#interrupt-cells' found, but node is not an interrupt provider /kisskb/src/arch/arc/boot/dts/axc003_idu.dtsi:109.18-111.5: Warning (interrupt_provider): /axs10x_mb/ethernet@18000: '#interrupt-cells' found, but node is not an interrupt provider also defined at /kisskb/src/arch/arc/boot/dts/axs10x_mb.dtsi:73.24-88.5 arch/arc/boot/dts/axs103_idu.dtb: Warning (interrupt_map): Failed prerequisite 'interrupt_provider' /kisskb/src/arch/arc/kernel/ptrace.c:342:16: warning: no previous prototype for 'syscall_trace_enter' [-Wmissing-prototypes] 342 | asmlinkage int syscall_trace_enter(struct pt_regs *regs) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/base/regmap/regcache-maple.c: In function 'regcache_maple_drop': /kisskb/src/drivers/base/regmap/regcache-maple.c:113:23: warning: 'lower_index' is used uninitialized [-Wuninitialized] 113 | unsigned long lower_index, lower_last; | ^~~~~~~~~~~ /kisskb/src/drivers/base/regmap/regcache-maple.c:113:36: warning: 'lower_last' is used uninitialized [-Wuninitialized] 113 | unsigned long lower_index, lower_last; | ^~~~~~~~~~ /kisskb/src/drivers/base/regmap/regcache-maple.c:114:23: warning: 'upper_index' is used uninitialized [-Wuninitialized] 114 | unsigned long upper_index, upper_last; | ^~~~~~~~~~~ /kisskb/src/drivers/base/regmap/regcache-maple.c:114:36: warning: 'upper_last' is used uninitialized [-Wuninitialized] 114 | unsigned long upper_index, upper_last; | ^~~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_axs103_smp_defconfig_arc-gcc13 # Build took: 0:01:07.109678