# git rev-parse -q --verify 1c9df907da83812e4f33b59d3d142c864d9da57f^{commit} 1c9df907da83812e4f33b59d3d142c864d9da57f already have revision, skipping fetch # git checkout -q -f -B kisskb 1c9df907da83812e4f33b59d3d142c864d9da57f # git clean -qxdf # < git log -1 # commit 1c9df907da83812e4f33b59d3d142c864d9da57f # Author: Willy Tarreau # Date: Thu Jul 30 07:59:24 2020 +0200 # # random: fix circular include dependency on arm64 after addition of percpu.h # # Daniel Díaz and Kees Cook independently reported that commit # f227e3ec3b5c ("random32: update the net random state on interrupt and # activity") broke arm64 due to a circular dependency on include files # since the addition of percpu.h in random.h. # # The correct fix would definitely be to move all the prandom32 stuff out # of random.h but for backporting, a smaller solution is preferred. # # This one replaces linux/percpu.h with asm/percpu.h, and this fixes the # problem on x86_64, arm64, arm, and mips. Note that moving percpu.h # around didn't change anything and that removing it entirely broke # differently. When backporting, such options might still be considered # if this patch fails to help. # # [ It turns out that an alternate fix seems to be to just remove the # troublesome remove from the arm64 # that causes the circular dependency. # # But we might as well do the whole belt-and-suspenders thing, and # minimize inclusion in too. Either will fix the # problem, and both are good changes. - Linus ] # # Reported-by: Daniel Díaz # Reported-by: Kees Cook # Tested-by: Marc Zyngier # Fixes: f227e3ec3b5c # Cc: Stephen Rothwell # Signed-off-by: Willy Tarreau # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 1c9df907da83812e4f33b59d3d142c864d9da57f # < make -s -j 80 ARCH=x86_64 O=/kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux- randconfig KCONFIG_SEED=0xE6A6965B # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_CC_STACKPROTECTOR_STRONG=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # < make -s -j 80 ARCH=x86_64 O=/kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux- help # make -s -j 80 ARCH=x86_64 O=/kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux- olddefconfig .config:5975:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD # make -s -j 80 ARCH=x86_64 O=/kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux- Completed OK # rm -rf /kisskb/build/linus-rand_x86_64-randconfig_x86_64-gcc8 # Build took: 0:06:46.201630