# git rev-parse -q --verify f8cf2f16a7c95acce497bfafa90e7c6d8397d653^{commit} f8cf2f16a7c95acce497bfafa90e7c6d8397d653 already have revision, skipping fetch # git checkout -q -f -B kisskb f8cf2f16a7c95acce497bfafa90e7c6d8397d653 # git clean -qxdf # < git log -1 # commit f8cf2f16a7c95acce497bfafa90e7c6d8397d653 # Merge: 4b3f1a1 ab60368 # Author: Linus Torvalds # Date: Sat Apr 7 16:53:59 2018 -0700 # # Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security # # Pull integrity updates from James Morris: # "A mixture of bug fixes, code cleanup, and continues to close # IMA-measurement, IMA-appraisal, and IMA-audit gaps. # # Also note the addition of a new cred_getsecid LSM hook by Matthew # Garrett: # # For IMA purposes, we want to be able to obtain the prepared secid # in the bprm structure before the credentials are committed. Add a # cred_getsecid hook that makes this possible. # # which is used by a new CREDS_CHECK target in IMA: # # In ima_bprm_check(), check with both the existing process # credentials and the credentials that will be committed when the new # process is started. This will not change behaviour unless the # system policy is extended to include CREDS_CHECK targets - # BPRM_CHECK will continue to check the same credentials that it did # previously" # # * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: # ima: Fallback to the builtin hash algorithm # ima: Add smackfs to the default appraise/measure list # evm: check for remount ro in progress before writing # ima: Improvements in ima_appraise_measurement() # ima: Simplify ima_eventsig_init() # integrity: Remove unused macro IMA_ACTION_RULE_FLAGS # ima: drop vla in ima_audit_measurement() # ima: Fix Kconfig to select TPM 2.0 CRB interface # evm: Constify *integrity_status_msg[] # evm: Move evm_hmac and evm_hash from evm_main.c to evm_crypto.c # fuse: define the filesystem as untrusted # ima: fail signature verification based on policy # ima: clear IMA_HASH # ima: re-evaluate files on privileged mounted filesystems # ima: fail file signature verification on non-init mounted filesystems # IMA: Support using new creds in appraisal policy # security: Add a cred_getsecid hook # < /opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-gcc --version # < git log --format=%s --max-count=1 f8cf2f16a7c95acce497bfafa90e7c6d8397d653 # < make -s -j 120 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # yes \n | make -s -j 120 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -s -j 120 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:5:0, from /kisskb/src/arch/sparc/include/asm/atomic_64.h:12, from /kisskb/src/arch/sparc/include/asm/atomic.h:5, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/include/asm-generic/qspinlock_types.h:28, from /kisskb/src/arch/sparc/include/asm/spinlock_types.h:6, from /kisskb/src/include/linux/spinlock_types.h:13, from /kisskb/src/include/linux/spinlock.h:82, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ocfs2/file.c:27: /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/fs/ocfs2/file.c:2386:3: note: in expansion of macro 'xchg' xchg(&iocb->ki_complete, saved_ki_complete); ^ /kisskb/src/drivers/input/joystick/analog.c:176:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:5:0, from /kisskb/src/arch/sparc/include/asm/atomic_64.h:12, from /kisskb/src/arch/sparc/include/asm/atomic.h:5, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/include/asm-generic/qspinlock_types.h:28, from /kisskb/src/arch/sparc/include/asm/spinlock_types.h:6, from /kisskb/src/include/linux/spinlock_types.h:13, from /kisskb/src/include/linux/spinlock.h:82, 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:10, from /kisskb/src/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c:30: /kisskb/src/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c: In function 'ixgbe_xdp_setup': /kisskb/src/arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c:9973:4: note: in expansion of macro 'xchg' xchg(&adapter->rx_ring[i]->xdp_prog, adapter->xdp_prog); ^ In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:5:0, from /kisskb/src/arch/sparc/include/asm/atomic_64.h:12, from /kisskb/src/arch/sparc/include/asm/atomic.h:5, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/include/asm-generic/qspinlock_types.h:28, from /kisskb/src/arch/sparc/include/asm/spinlock_types.h:6, from /kisskb/src/include/linux/spinlock_types.h:13, from /kisskb/src/include/linux/spinlock.h:82, 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:10, from /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c:35: /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c: In function 'ixgbevf_xdp_setup': /kisskb/src/arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c:4446:4: note: in expansion of macro 'xchg' xchg(&adapter->rx_ring[i]->xdp_prog, adapter->xdp_prog); ^ kernel: arch/sparc/boot/image is ready kernel: arch/sparc/boot/zImage is ready Completed OK # rm -rf /kisskb/build/linus_sparc64-allmodconfig_sparc64 # Build took: 0:06:21.000170