# git rev-parse -q --verify f91e654474d413201ae578820fb63f8a811f6c4e^{commit} f91e654474d413201ae578820fb63f8a811f6c4e already have revision, skipping fetch # git checkout -q -f -B kisskb f91e654474d413201ae578820fb63f8a811f6c4e # git clean -qxdf # < git log -1 # commit f91e654474d413201ae578820fb63f8a811f6c4e # Merge: c715ebe 3dd0f18 # Author: Linus Torvalds # Date: Wed Aug 15 22:54:12 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: # "This adds support for EVM signatures based on larger digests, contains # a new audit record AUDIT_INTEGRITY_POLICY_RULE to differentiate the # IMA policy rules from the IMA-audit messages, addresses two deadlocks # due to either loading or searching for crypto algorithms, and cleans # up the audit messages" # # * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: # EVM: fix return value check in evm_write_xattrs() # integrity: prevent deadlock during digsig verification. # evm: Allow non-SHA1 digital signatures # evm: Don't deadlock if a crypto algorithm is unavailable # integrity: silence warning when CONFIG_SECURITYFS is not enabled # ima: Differentiate auditing policy rules from "audit" actions # ima: Do not audit if CONFIG_INTEGRITY_AUDIT is not set # ima: Use audit_log_format() rather than audit_log_string() # ima: Call audit_log_string() rather than logging it untrusted # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < git log --format=%s --max-count=1 f91e654474d413201ae578820fb63f8a811f6c4e # < make -s -j 48 ARCH=um O=/kisskb/build/linus_um-defconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 defconfig # make -s -j 48 ARCH=um O=/kisskb/build/linus_um-defconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/um/os-Linux/skas/process.c: In function 'start_idle_thread': /kisskb/src/arch/um/os-Linux/skas/process.c:613:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ /kisskb/src/net/core/rtnetlink.c: In function 'rtnl_newlink': /kisskb/src/net/core/rtnetlink.c:3148:1: warning: the frame size of 1296 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ LINK linux Completed OK # rm -rf /kisskb/build/linus_um-defconfig_um-x86_64 # Build took: 0:00:40.753970