# 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/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < git log --format=%s --max-count=1 f8cf2f16a7c95acce497bfafa90e7c6d8397d653 # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_magicpanelr2_defconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- magicpanelr2_defconfig # make -s -j 48 ARCH=sh O=/kisskb/build/linus_magicpanelr2_defconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1317:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp] :1320:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp] :1323:2: warning: #warning syscall pkey_free not implemented [-Wcpp] :1326:2: warning: #warning syscall statx not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh3/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh3/../../entry-common.S:389: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh3/../../entry-common.S:392: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/clock-cpg.c: In function 'cpg_clk_init': /kisskb/src/arch/sh/kernel/cpu/clock-cpg.c:53:3: warning: 'arch_init_clk_ops' is deprecated (declared at /kisskb/src/arch/sh/include/asm/clock.h:8) [-Wdeprecated-declarations] /kisskb/src/arch/sh/kernel/cpu/clock-cpg.c: In function 'arch_clk_init': /kisskb/src/arch/sh/kernel/cpu/clock-cpg.c:77:2: warning: 'cpg_clk_init' is deprecated (declared at /kisskb/src/arch/sh/kernel/cpu/clock-cpg.c:47) [-Wdeprecated-declarations] /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:182:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/sh/clk/cpg.c: In function 'r8': /kisskb/src/drivers/sh/clk/cpg.c:41:2: warning: passing argument 1 of 'ioread8' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:29:21: note: expected 'void *' but argument is of type 'const void *' /kisskb/src/drivers/sh/clk/cpg.c: In function 'r16': /kisskb/src/drivers/sh/clk/cpg.c:46:2: warning: passing argument 1 of 'ioread16' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:30:21: note: expected 'void *' but argument is of type 'const void *' /kisskb/src/drivers/sh/clk/cpg.c: In function 'r32': /kisskb/src/drivers/sh/clk/cpg.c:51:2: warning: passing argument 1 of 'ioread32' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:32:21: note: expected 'void *' but argument is of type 'const void *' Kernel: arch/sh/boot/zImage is ready Completed OK # rm -rf /kisskb/build/linus_magicpanelr2_defconfig_sh4 # Build took: 0:00:49.582246