# 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/arcompact-buildroot-2015.08.1/bin/arc-buildroot-linux-uclibc-gcc --version # < git log --format=%s --max-count=1 f91e654474d413201ae578820fb63f8a811f6c4e # < make -s -j 120 ARCH=arc O=/kisskb/build/linus_axs101_defconfig_arcompact CROSS_COMPILE=/opt/cross/kisskb/arcompact-buildroot-2015.08.1/bin/arc-buildroot-linux-uclibc- axs101_defconfig # Added to kconfig CONFIG_INITRAMFS_SOURCE="" # make -s -j 120 ARCH=arc O=/kisskb/build/linus_axs101_defconfig_arcompact CROSS_COMPILE=/opt/cross/kisskb/arcompact-buildroot-2015.08.1/bin/arc-buildroot-linux-uclibc- olddefconfig # make -s -j 120 ARCH=arc O=/kisskb/build/linus_axs101_defconfig_arcompact CROSS_COMPILE=/opt/cross/kisskb/arcompact-buildroot-2015.08.1/bin/arc-buildroot-linux-uclibc- In file included from /kisskb/src/include/asm-generic/bug.h:18:0, from /kisskb/src/arch/arc/include/asm/bug.h:32, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/mmdebug.h:5, from /kisskb/src/include/linux/gfp.h:5, from /kisskb/src/include/linux/slab.h:15, from /kisskb/src/mm/nobootmem.c:14: /kisskb/src/mm/nobootmem.c: In function '__free_pages_memory': /kisskb/src/include/linux/kernel.h:812:29: warning: comparison of distinct pointer types lacks a cast [enabled by default] (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1))) ^ /kisskb/src/include/linux/kernel.h:826:4: note: in expansion of macro '__typecheck' (__typecheck(x, y) && __no_side_effects(x, y)) ^ /kisskb/src/include/linux/kernel.h:836:24: note: in expansion of macro '__safe_cmp' __builtin_choose_expr(__safe_cmp(x, y), \ ^ /kisskb/src/include/linux/kernel.h:845:19: note: in expansion of macro '__careful_cmp' #define min(x, y) __careful_cmp(x, y, <) ^ /kisskb/src/mm/nobootmem.c:104:11: note: in expansion of macro 'min' order = min(MAX_ORDER - 1UL, __ffs(start)); ^ /kisskb/src/net/ipv4/tcp_input.c: In function 'tcp_data_queue': /kisskb/src/net/ipv4/tcp_input.c:4319:49: warning: array subscript is above array bounds [-Warray-bounds] tp->selective_acks[i-1] = tp->selective_acks[i]; ^ Completed OK # rm -rf /kisskb/build/linus_axs101_defconfig_arcompact # Build took: 0:00:25.547570