# 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/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld --version # < git log --format=%s --max-count=1 3950e975431bc914f7e81b8f2a2dbdf2064acb0f # < make -s -j 10 ARCH=arm O=/kisskb/build/linus_rpc_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- rpc_defconfig # < make -s -j 10 ARCH=arm O=/kisskb/build/linus_rpc_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- help # make -s -j 10 ARCH=arm O=/kisskb/build/linus_rpc_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- olddefconfig # make -s -j 10 ARCH=arm O=/kisskb/build/linus_rpc_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- /kisskb/src/drivers/tty/vt/vt_ioctl.c: In function 'vt_ioctl': /kisskb/src/drivers/tty/vt/vt_ioctl.c:1043:1: internal compiler error: Max. number of generated reload insns per insn is achieved (90) } ^ Please submit a full bug report, with preprocessed source if appropriate. See for instructions. make[4]: *** [/kisskb/src/scripts/Makefile.build:281: drivers/tty/vt/vt_ioctl.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:497: drivers/tty/vt] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:497: drivers/tty] Error 2 make[1]: *** [/kisskb/src/Makefile:1766: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/fs/fat/dir.c: In function 'fat_ioctl_filldir': /kisskb/src/fs/fat/dir.c:759:43: internal compiler error: Max. number of generated reload insns per insn is achieved (90) FAT_IOCTL_FILLDIR_FUNC(fat_ioctl_filldir, __fat_dirent) ^ /kisskb/src/fs/fat/dir.c:714:9: note: in definition of macro 'FAT_IOCTL_FILLDIR_FUNC' struct dirent_type __user *d2 = d1 + 1; \ ^ Please submit a full bug report, with preprocessed source if appropriate. See for instructions. make[3]: *** [/kisskb/src/scripts/Makefile.build:281: fs/fat/dir.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:497: fs/fat] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1766: fs] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 10 ARCH=arm O=/kisskb/build/linus_rpc_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_rpc_defconfig_arm-gcc4.9 # Build took: 0:01:09.356919