# git rev-parse -q --verify c64396cc36c6e60704ab06c1fb1c4a46179c9120^{commit} c64396cc36c6e60704ab06c1fb1c4a46179c9120 already have revision, skipping fetch # git checkout -q -f -B kisskb c64396cc36c6e60704ab06c1fb1c4a46179c9120 # git clean -qxdf # < git log -1 # commit c64396cc36c6e60704ab06c1fb1c4a46179c9120 # Merge: e5ff2cb9cf67 34b1a1ce1458 # Author: Linus Torvalds # Date: Thu Jan 28 11:18:43 2021 -0800 # # Merge tag 'locking-urgent-2021-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull locking fixes from Thomas Gleixner: # "A set of PI futex fixes: # # - Address a longstanding issue where the user space part of the PI # futex is not writeable. The kernel returns with inconsistent state # which can in the worst case result in a UAF of a tasks kernel # stack. # # The solution is to establish consistent kernel state which makes # future operations on the futex fail because user space and kernel # space state are inconsistent. Not a problem as PI futexes # fundamentaly require a functional RW mapping and if user space # pulls the rug under it, then it can keep the pieces it asked for. # # - Address an issue where the return value is incorrect in case that # the futex was acquired after a timeout/signal made the waiter drop # out of the rtmutex wait. # # In one of the corner cases the kernel returned an error code # despite having successfully acquired the futex" # # * tag 'locking-urgent-2021-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # futex: Handle faults correctly for PI futexes # futex: Simplify fixup_pi_state_owner() # futex: Use pi_state_update_owner() in put_pi_state() # rtmutex: Remove unused argument from rt_mutex_proxy_unlock() # futex: Provide and use pi_state_update_owner() # futex: Replace pointless printk in fixup_owner() # futex: Ensure the correct return value from futex_lock_pi() # < /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 c64396cc36c6e60704ab06c1fb1c4a46179c9120 # < make -s -j 8 ARCH=arm O=/kisskb/build/linus_omap2plus_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- omap2plus_defconfig # < make -s -j 8 ARCH=arm O=/kisskb/build/linus_omap2plus_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 8 ARCH=arm O=/kisskb/build/linus_omap2plus_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 8 ARCH=arm O=/kisskb/build/linus_omap2plus_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/tm.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/arm_ssp_per_task_plugin.c:3: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/config/elfos.h:102:21: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "%s"HOST_WIDE_INT_PRINT_UNSIGNED"\n",\ ^ /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/config/elfos.h:170:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/tm.h:44, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/arm_ssp_per_task_plugin.c:3: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/defaults.h:126:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ cc1plus: warning: unrecognized command line option '-Wno-format-diag' /kisskb/src/arch/arm/crypto/ghash-ce-glue.c: In function 'ghash_do_update': /kisskb/src/arch/arm/crypto/ghash-ce-glue.c:67:44: warning: passing argument 4 of 'pmull_ghash_update_p64' from incompatible pointer type pmull_ghash_update_p64(blocks, dg, src, key->h, head); ^ /kisskb/src/arch/arm/crypto/ghash-ce-glue.c:45:17: note: expected 'const u64 (*)[2]' but argument is of type 'u64 (*)[2]' asmlinkage void pmull_ghash_update_p64(int blocks, u64 dg[], const char *src, ^ /kisskb/src/arch/arm/crypto/ghash-ce-glue.c:69:43: warning: passing argument 4 of 'pmull_ghash_update_p8' from incompatible pointer type pmull_ghash_update_p8(blocks, dg, src, key->h, head); ^ /kisskb/src/arch/arm/crypto/ghash-ce-glue.c:48:17: note: expected 'const u64 (*)[2]' but argument is of type 'u64 (*)[2]' asmlinkage void pmull_ghash_update_p8(int blocks, u64 dg[], const char *src, ^ Completed OK # rm -rf /kisskb/build/linus_omap2plus_defconfig_arm-gcc4.9 # Build took: 0:05:03.218450