# git rev-parse -q --verify 15a2bc4dbb9cfed1c661a657fcb10798150b7598^{commit} 15a2bc4dbb9cfed1c661a657fcb10798150b7598 already have revision, skipping fetch # git checkout -q -f -B kisskb 15a2bc4dbb9cfed1c661a657fcb10798150b7598 # git clean -qxdf # < git log -1 # commit 15a2bc4dbb9cfed1c661a657fcb10798150b7598 # Merge: 9ff7258575d5 3977e285ee89 # Author: Linus Torvalds # Date: Thu Jun 4 14:07:08 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: # "Last cycle for the Nth time I ran into bugs and quality of # implementation issues related to exec that could not be easily be # fixed because of the way exec is implemented. So I have been digging # into exec and cleanup up what I can. # # I don't think I have exec sorted out enough to fix the issues I # started with but I have made some headway this cycle with 4 sets of # changes. # # - promised cleanups after introducing exec_update_mutex # # - trivial cleanups for exec # # - control flow simplifications # # - remove the recomputation of bprm->cred # # The net result is code that is a bit easier to understand and work # with and a decrease in the number of lines of code (if you don't count # the added tests)" # # * 'exec-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (24 commits) # exec: Compute file based creds only once # exec: Add a per bprm->file version of per_clear # binfmt_elf_fdpic: fix execfd build regression # selftests/exec: Add binfmt_script regression test # exec: Remove recursion from search_binary_handler # exec: Generic execfd support # exec/binfmt_script: Don't modify bprm->buf and then return -ENOEXEC # exec: Move the call of prepare_binprm into search_binary_handler # exec: Allow load_misc_binary to call prepare_binprm unconditionally # exec: Convert security_bprm_set_creds into security_bprm_repopulate_creds # exec: Factor security_bprm_creds_for_exec out of security_bprm_set_creds # exec: Teach prepare_exec_creds how exec treats uids & gids # exec: Set the point of no return sooner # exec: Move handling of the point of no return to the top level # exec: Run sync_mm_rss before taking exec_update_mutex # exec: Fix spelling of search_binary_handler in a comment # exec: Move the comment from above de_thread to above unshare_sighand # exec: Rename flush_old_exec begin_new_exec # exec: Move most of setup_new_exec into flush_old_exec # exec: In setup_new_exec cache current in the local variable me # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 15a2bc4dbb9cfed1c661a657fcb10798150b7598 # < make -s -j 8 ARCH=m68k O=/kisskb/build/linus_m5272c3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- m5272c3_defconfig # < make -s -j 8 ARCH=m68k O=/kisskb/build/linus_m5272c3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 8 ARCH=m68k O=/kisskb/build/linus_m5272c3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 8 ARCH=m68k O=/kisskb/build/linus_m5272c3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/arch/m68k/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/linux/spinlock.h:460, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/net/core/filter.c:20: /kisskb/src/net/core/filter.c: In function 'bpf_clear_redirect_map': /kisskb/src/arch/m68k/include/asm/cmpxchg.h:137:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\ ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (unsigned long)(n), sizeof(*(ptr)))) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/cmpxchg.h:106:28: note: in expansion of macro 'cmpxchg_local' #define cmpxchg(ptr, o, n) cmpxchg_local((ptr), (o), (n)) ^~~~~~~~~~~~~ /kisskb/src/net/core/filter.c:3567:4: note: in expansion of macro 'cmpxchg' cmpxchg(&ri->map, map, NULL); ^~~~~~~ /kisskb/src/drivers/net/ethernet/freescale/fec_main.c: In function 'fec_restart': /kisskb/src/drivers/net/ethernet/freescale/fec_main.c:949:6: warning: unused variable 'val' [-Wunused-variable] u32 val; ^~~ /kisskb/src/drivers/net/ethernet/freescale/fec_main.c: In function 'fec_get_mac': /kisskb/src/drivers/net/ethernet/freescale/fec_main.c:1692:28: warning: unused variable 'pdata' [-Wunused-variable] struct fec_platform_data *pdata = dev_get_platdata(&fep->pdev->dev); ^~~~~ Completed OK # rm -rf /kisskb/build/linus_m5272c3_defconfig_m68k-gcc8 # Build took: 0:01:01.125857