# git rev-parse -q --verify e6e6ec48dd0fa12e8a2d1ff6b55cd907401bd7fe^{commit} e6e6ec48dd0fa12e8a2d1ff6b55cd907401bd7fe already have revision, skipping fetch # git checkout -q -f -B kisskb e6e6ec48dd0fa12e8a2d1ff6b55cd907401bd7fe # git clean -qxdf # < git log -1 # commit e6e6ec48dd0fa12e8a2d1ff6b55cd907401bd7fe # Merge: addcb1d0ee31 2b4eae95c736 # Author: Linus Torvalds # Date: Wed Mar 11 13:35:34 2020 -0700 # # Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt # # Pull fscrypt fix from Eric Biggers: # "Fix a bug where if userspace is writing to encrypted files while the # FS_IOC_REMOVE_ENCRYPTION_KEY ioctl (introduced in v5.4) is running, # dirty inodes could be evicted, causing writes could be lost or the # filesystem to hang due to a use-after-free. This was encountered # during real-world use, not just theoretical. # # Tested with the existing fscrypt xfstests, and with a new xfstest I # wrote to reproduce this bug. This fix does expose an existing bug with # '-o lazytime' that Ted is working on fixing, but this fix is more # critical and needed anyway regardless of the lazytime fix" # # * tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt: # fscrypt: don't evict dirty inodes after removing key # < /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 e6e6ec48dd0fa12e8a2d1ff6b55cd907401bd7fe # < 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- /kisskb/src/drivers/net/ethernet/freescale/fec_main.c: In function 'fec_restart': /kisskb/src/drivers/net/ethernet/freescale/fec_main.c:915: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:1643:28: warning: unused variable 'pdata' [-Wunused-variable] struct fec_platform_data *pdata = dev_get_platdata(&fep->pdev->dev); ^~~~~ 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:445, 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:3516:4: note: in expansion of macro 'cmpxchg' cmpxchg(&ri->map, map, NULL); ^~~~~~~ Completed OK # rm -rf /kisskb/build/linus_m5272c3_defconfig_m68k-gcc8 # Build took: 0:00:40.997128