# git rev-parse -q --verify 3950e975431bc914f7e81b8f2a2dbdf2064acb0f^{commit} 3950e975431bc914f7e81b8f2a2dbdf2064acb0f already have revision, skipping fetch # git checkout -q -f -B kisskb 3950e975431bc914f7e81b8f2a2dbdf2064acb0f # git clean -qxdf # < git log -1 # commit 3950e975431bc914f7e81b8f2a2dbdf2064acb0f # Merge: fd76a74d940a 7fce69dff8db # Author: Linus Torvalds # Date: Tue Aug 4 14:27:25 2020 -0700 # # Merge branch 'exec-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace # # Pull execve updates from Eric Biederman: # "During the development of v5.7 I ran into bugs and quality of # implementation issues related to exec that could not be easily fixed # because of the way exec is implemented. So I have been diggin into # exec and cleaning up what I can. # # This cycle I have been looking at different ideas and different # implementations to see what is possible to improve exec, and cleaning # the way exec interfaces with in kernel users. Only cleaning up the # interfaces of exec with rest of the kernel has managed to stabalize # and make it through review in time for v5.9-rc1 resulting in 2 sets of # changes this cycle. # # - Implement kernel_execve # # - Make the user mode driver code a better citizen # # With kernel_execve the code size got a little larger as the copying of # parameters from userspace and copying of parameters from userspace is # now separate. The good news is kernel threads no longer need to play # games with set_fs to use exec. Which when combined with the rest of # Christophs set_fs changes should security bugs with set_fs much more # difficult" # # * 'exec-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (23 commits) # exec: Implement kernel_execve # exec: Factor bprm_stack_limits out of prepare_arg_pages # exec: Factor bprm_execve out of do_execve_common # exec: Move bprm_mm_init into alloc_bprm # exec: Move initialization of bprm->filename into alloc_bprm # exec: Factor out alloc_bprm # exec: Remove unnecessary spaces from binfmts.h # umd: Stop using split_argv # umd: Remove exit_umh # bpfilter: Take advantage of the facilities of struct pid # exit: Factor thread_group_exited out of pidfd_poll # umd: Track user space drivers with struct pid # bpfilter: Move bpfilter_umh back into init data # exec: Remove do_execve_file # umh: Stop calling do_execve_file # umd: Transform fork_usermode_blob into fork_usermode_driver # umd: Rename umd_info.cmdline umd_info.driver_name # umd: For clarity rename umh_info umd_info # umh: Separate the user mode driver and the user mode helper support # umh: Remove call_usermodehelper_setup_file. # ... # < /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 3950e975431bc914f7e81b8f2a2dbdf2064acb0f # < make -s -j 24 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 # < make -s -j 24 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 24 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:4295:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:4297:warning: override: reassigning to symbol UML_NET_SLIP .config:4300:warning: override: reassigning to symbol UML_NET_MCAST .config:4302:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 24 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 /kisskb/src/arch/um/os-Linux/signal.c: In function 'sig_handler_common': /kisskb/src/arch/um/os-Linux/signal.c:51:1: warning: the frame size of 2976 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/arch/um/os-Linux/signal.c: In function 'timer_real_alarm_handler': /kisskb/src/arch/um/os-Linux/signal.c:95:1: warning: the frame size of 2960 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/lib/lz4/lz4hc_compress.c: In function 'LZ4HC_compress_generic': /kisskb/src/lib/lz4/lz4hc_compress.c:579:1: warning: the frame size of 2144 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ LINK linux ERROR: modpost: "devm_platform_ioremap_resource" [drivers/iio/adc/adi-axi-adc.ko] undefined! ERROR: modpost: "devm_platform_ioremap_resource" [drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.ko] undefined! ERROR: modpost: "devm_platform_ioremap_resource" [drivers/ptp/ptp_ines.ko] undefined! ERROR: modpost: "devm_ioremap_resource" [drivers/net/ethernet/xilinx/xilinx_emac.ko] undefined! ERROR: modpost: "devm_ioremap" [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:111: Module.symvers] Error 1 make[2]: *** Deleting file 'Module.symvers' make[1]: *** [/kisskb/src/Makefile:1370: modules] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 24 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:32.443932