# git rev-parse -q --verify 57fa2369ab17d67e6232f85b868652fbf4407206^{commit} 57fa2369ab17d67e6232f85b868652fbf4407206 already have revision, skipping fetch # git checkout -q -f -B kisskb 57fa2369ab17d67e6232f85b868652fbf4407206 # git clean -qxdf # < git log -1 # commit 57fa2369ab17d67e6232f85b868652fbf4407206 # Merge: 2fbc66c7838a 9186ad8e66ba # Author: Linus Torvalds # Date: Tue Apr 27 10:16:46 2021 -0700 # # Merge tag 'cfi-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux # # Pull CFI on arm64 support from Kees Cook: # "This builds on last cycle's LTO work, and allows the arm64 kernels to # be built with Clang's Control Flow Integrity feature. This feature has # happily lived in Android kernels for almost 3 years[1], so I'm excited # to have it ready for upstream. # # The wide diffstat is mainly due to the treewide fixing of mismatched # list_sort prototypes. Other things in core kernel are to address # various CFI corner cases. The largest code portion is the CFI runtime # implementation itself (which will be shared by all architectures # implementing support for CFI). The arm64 pieces are Acked by arm64 # maintainers rather than coming through the arm64 tree since carrying # this tree over there was going to be awkward. # # CFI support for x86 is still under development, but is pretty close. # There are a handful of corner cases on x86 that need some improvements # to Clang and objtool, but otherwise works well. # # Summary: # # - Clean up list_sort prototypes (Sami Tolvanen) # # - Introduce CONFIG_CFI_CLANG for arm64 (Sami Tolvanen)" # # * tag 'cfi-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: # arm64: allow CONFIG_CFI_CLANG to be selected # KVM: arm64: Disable CFI for nVHE # arm64: ftrace: use function_nocfi for ftrace_call # arm64: add __nocfi to __apply_alternatives # arm64: add __nocfi to functions that jump to a physical address # arm64: use function_nocfi with __pa_symbol # arm64: implement function_nocfi # psci: use function_nocfi for cpu_resume # lkdtm: use function_nocfi # treewide: Change list_sort to use const pointers # bpf: disable CFI in dispatcher functions # kallsyms: strip ThinLTO hashes from static functions # kthread: use WARN_ON_FUNCTION_MISMATCH # workqueue: use WARN_ON_FUNCTION_MISMATCH # module: ensure __cfi_check alignment # mm: add generic function_nocfi macro # cfi: add __cficanonical # add support for Clang CFI # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 57fa2369ab17d67e6232f85b868652fbf4407206 # < make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=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 # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:4536:warning: override: reassigning to symbol GCC_PLUGIN_CYC_COMPLEXITY .config:4538:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:4542:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:4544:warning: override: reassigning to symbol UML_NET_SLIP .config:4547:warning: override: reassigning to symbol UML_NET_MCAST .config:4549:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] LINK linux ERROR: modpost: "devm_ioremap_resource" [drivers/net/ethernet/xilinx/xilinx_emac.ko] undefined! ERROR: modpost: "devm_ioremap_resource" [drivers/net/ethernet/xilinx/xilinx_emaclite.ko] undefined! ERROR: modpost: "devm_platform_ioremap_resource_byname" [drivers/net/ethernet/xilinx/ll_temac.ko] undefined! ERROR: modpost: "devm_platform_ioremap_resource" [drivers/net/ethernet/xilinx/ll_temac.ko] undefined! ERROR: modpost: "devm_of_iomap" [drivers/net/ethernet/xilinx/ll_temac.ko] undefined! make[2]: *** [/kisskb/src/scripts/Makefile.modpost:132: Module.symvers] Error 1 make[2]: *** Deleting file 'Module.symvers' make[1]: *** [/kisskb/src/Makefile:1463: modules] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allmodconfig_um-x86_64 # Build took: 0:07:35.684829