# 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/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 3950e975431bc914f7e81b8f2a2dbdf2064acb0f # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_ppc44x_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc44x_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_ppc44x_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_ppc44x_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_ppc44x_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/block/genhd.c: In function 'diskstats_show': /kisskb/src/block/genhd.c:1667:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/lib/zstd/compress.c: In function 'ZSTD_compressBlock_doubleFast': /kisskb/src/lib/zstd/compress.c:1393:1: warning: the frame size of 1584 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/arch/powerpc/boot/dts/katmai.dts:322.26-361.5: Warning (pci_bridge): /plb/pciex@d00000000: node name is not "pci" or "pcie" /kisskb/src/arch/powerpc/boot/dts/katmai.dts:363.26-402.5: Warning (pci_bridge): /plb/pciex@d20000000: node name is not "pci" or "pcie" /kisskb/src/arch/powerpc/boot/dts/katmai.dts:404.26-443.5: Warning (pci_bridge): /plb/pciex@d40000000: node name is not "pci" or "pcie" arch/powerpc/boot/dts/katmai.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' INFO: Uncompressed kernel (size 0x5db67c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5db67c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5db67c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5db67c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5db67c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5db67c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5db67c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5db67c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5db67c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5db67c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5db67c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Image Name: Linux-5.8.0-g3950e975431b Created: Wed Aug 5 08:50:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3023114 Bytes = 2952.26 KiB = 2.88 MiB Load Address: 00600000 Entry Point: 00601488 Image Name: Linux-5.8.0-g3950e975431b Created: Wed Aug 5 08:50:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3022357 Bytes = 2951.52 KiB = 2.88 MiB Load Address: 00600000 Entry Point: 00601498 Image Name: Linux-5.8.0-g3950e975431b Created: Wed Aug 5 08:50:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3023045 Bytes = 2952.19 KiB = 2.88 MiB Load Address: 00600000 Entry Point: 006000c4 Image Name: Linux-5.8.0-g3950e975431b Created: Wed Aug 5 08:50:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3022451 Bytes = 2951.61 KiB = 2.88 MiB Load Address: 00600000 Entry Point: 006014a8 Image Name: Linux-5.8.0-g3950e975431b Created: Wed Aug 5 08:50:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3022391 Bytes = 2951.55 KiB = 2.88 MiB Load Address: 00600000 Entry Point: 006014b8 Image Name: Linux-5.8.0-g3950e975431b Created: Wed Aug 5 08:50:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3021842 Bytes = 2951.02 KiB = 2.88 MiB Load Address: 00600000 Entry Point: 006014a8 Image Name: Linux-5.8.0-g3950e975431b Created: Wed Aug 5 08:50:33 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3023084 Bytes = 2952.23 KiB = 2.88 MiB Load Address: 00600000 Entry Point: 006014a8 Image Name: Linux-5.8.0-g3950e975431b Created: Wed Aug 5 08:50:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3022148 Bytes = 2951.32 KiB = 2.88 MiB Load Address: 00600000 Entry Point: 006001b8 Image Name: Linux-5.8.0-g3950e975431b Created: Wed Aug 5 08:50:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3022771 Bytes = 2951.92 KiB = 2.88 MiB Load Address: 00600000 Entry Point: 006014a0 Completed OK # rm -rf /kisskb/build/linus_ppc44x_defconfig_powerpc-gcc4.9 # Build took: 0:01:04.917578