# 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/aarch64-linux/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 4535e1a4174c4111d92c5a9a21e542d232e0fcaa # make -s -j 32 ARCH=arm64 O=/kisskb/build/linus_defconfig_arm64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux- defconfig # < make -s -j 32 ARCH=arm64 O=/kisskb/build/linus_defconfig_arm64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux- help # make -s -j 32 ARCH=arm64 O=/kisskb/build/linus_defconfig_arm64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux- olddefconfig # make -s -j 32 ARCH=arm64 O=/kisskb/build/linus_defconfig_arm64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/aarch64-linux/bin/aarch64-linux- Completed OK # rm -rf /kisskb/build/linus_defconfig_arm64-gcc13 # Build took: 0:07:06.772949