# git rev-parse -q --verify f1f2f614d535564992f32e720739cb53cf03489f^{commit} f1f2f614d535564992f32e720739cb53cf03489f already have revision, skipping fetch # git checkout -q -f -B kisskb f1f2f614d535564992f32e720739cb53cf03489f # git clean -qxdf # < git log -1 # commit f1f2f614d535564992f32e720739cb53cf03489f # Merge: 298fb76a5583 2a7f0e53daf2 # Author: Linus Torvalds # Date: Fri Sep 27 19:37:27 2019 -0700 # # Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity # # Pull integrity updates from Mimi Zohar: # "The major feature in this time is IMA support for measuring and # appraising appended file signatures. In addition are a couple of bug # fixes and code cleanup to use struct_size(). # # In addition to the PE/COFF and IMA xattr signatures, the kexec kernel # image may be signed with an appended signature, using the same # scripts/sign-file tool that is used to sign kernel modules. # # Similarly, the initramfs may contain an appended signature. # # This contained a lot of refactoring of the existing appended signature # verification code, so that IMA could retain the existing framework of # calculating the file hash once, storing it in the IMA measurement list # and extending the TPM, verifying the file's integrity based on a file # hash or signature (eg. xattrs), and adding an audit record containing # the file hash, all based on policy. (The IMA support for appended # signatures patch set was posted and reviewed 11 times.) # # The support for appended signature paves the way for adding other # signature verification methods, such as fs-verity, based on a single # system-wide policy. The file hash used for verifying the signature and # the signature, itself, can be included in the IMA measurement list" # # * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity: # ima: ima_api: Use struct_size() in kzalloc() # ima: use struct_size() in kzalloc() # sefltest/ima: support appended signatures (modsig) # ima: Fix use after free in ima_read_modsig() # MODSIGN: make new include file self contained # ima: fix freeing ongoing ahash_request # ima: always return negative code for error # ima: Store the measurement again when appraising a modsig # ima: Define ima-modsig template # ima: Collect modsig # ima: Implement support for module-style appended signatures # ima: Factor xattr_verify() out of ima_appraise_measurement() # ima: Add modsig appraise_type option for module-style appended signatures # integrity: Select CONFIG_KEYS instead of depending on it # PKCS#7: Introduce pkcs7_get_digest() # PKCS#7: Refactor verify_pkcs7_signature() # MODSIGN: Export module signature definitions # ima: initialize the "template" field with the default template # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 f1f2f614d535564992f32e720739cb53cf03489f # < make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- defconfig # make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] FIT description: Linux 5.3.0-gf1f2f614d535 Created: Sat Sep 28 14:35:25 2019 Image 0 (kernel@0) Description: Linux 5.3.0-gf1f2f614d535 Created: Sat Sep 28 14:35:25 2019 Type: Kernel Image Compression: gzip compressed Data Size: 4766136 Bytes = 4654.43 KiB = 4.55 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x808d08b0 Hash algo: sha1 Hash value: 365be3dd818851c38e4b01def2b9d02350d840cd Image 1 (fdt@boston) Description: img,boston Device Tree Created: Sat Sep 28 14:35:25 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Sat Sep 28 14:35:25 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Sat Sep 28 14:35:25 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 4639 Bytes = 4.53 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 018897896b42c41c943aca35a20e4300dba250c8 Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Sat Sep 28 14:35:25 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 5198 Bytes = 5.08 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 36c7bd0bd79cfc2f7dd6acda6c7996294f4967e6 Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Sat Sep 28 14:35:25 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-defconfig_mips-gcc8 # Build took: 0:01:10.332863