# 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/gcc-4.6.3-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/gcc-4.6.3-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 f1f2f614d535564992f32e720739cb53cf03489f # < make -s -j 24 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/m68k-linux/bin/m68k-linux- defconfig # make -s -j 24 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/m68k-linux/bin/m68k-linux- :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/m68k/mvme147/config.c: In function 'mvme147_hwclk': /kisskb/src/arch/m68k/mvme147/config.c:175:2: warning: #warning check me! [-Wcpp] /kisskb/src/arch/m68k/mvme16x/config.c: In function 'mvme16x_hwclk': /kisskb/src/arch/m68k/mvme16x/config.c:440:2: warning: #warning check me! [-Wcpp] /kisskb/src/ipc/shm.c: In function 'ksys_shmdt': /kisskb/src/ipc/shm.c:1712:59: warning: 'file' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:204:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/lib/mpi/mpicoder.c: In function 'mpi_read_raw_from_sgl': /kisskb/src/lib/mpi/mpicoder.c:336:12: warning: 'buff' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/cifs/smb2pdu.c: In function 'SMB2_ioctl_init': /kisskb/src/fs/cifs/smb2pdu.c:2682:19: warning: 'in_data_buf' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/lib/rhashtable.c: In function 'rht_deferred_worker': /kisskb/src/include/linux/rhashtable.h:110:10: warning: 'next' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/lib/rhashtable.c:222:28: note: 'next' was declared here /kisskb/src/kernel/acct.c: In function 'acct_pin_kill': /kisskb/src/kernel/acct.c:177:2: warning: value computed is not used [-Wunused-value] /kisskb/src/net/core/gen_stats.c: In function '__gnet_stats_copy_basic': /kisskb/src/net/core/gen_stats.c:157:19: warning: 'seq' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/core/dev.c: In function 'validate_xmit_skb_list': /kisskb/src/net/core/dev.c:3407:15: warning: 'tail' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/core/filter.c: In function 'bpf_clear_redirect_map': /kisskb/src/net/core/filter.c:3603:4: warning: value computed is not used [-Wunused-value] /kisskb/src/drivers/md/raid10.c: In function 'read_balance': /kisskb/src/drivers/md/raid10.c:842:22: warning: 'best_pending_slot' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:201:12: warning: '__ei_open' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:230:12: warning: '__ei_close' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:254:13: warning: '__ei_tx_timeout' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:300:20: warning: '__ei_start_xmit' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:509:13: warning: '__ei_poll' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:850:33: warning: '__ei_get_stats' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:950:13: warning: '__ei_set_multicast_list' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:988:27: warning: '____alloc_ei_netdev' defined but not used [-Wunused-function] /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:338:21: note: 'pdeo' was declared here /kisskb/src/fs/ocfs2/alloc.c: In function 'ocfs2_trim_mainbm': /kisskb/src/fs/ocfs2/alloc.c:7608:17: warning: 'first_bit' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/md/dm-writecache.c: In function 'writecache_writeback': /kisskb/src/drivers/md/dm-writecache.c:1613:18: warning: 'g' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/fs/ocfs2/file.c:2373:3: warning: value computed is not used [-Wunused-value] /kisskb/src/fs/udf/unicode.c: In function 'udf_name_conv_char': /kisskb/src/fs/udf/unicode.c:132:8: warning: 'c' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/posix_acl.c: In function 'get_acl': /kisskb/src/fs/posix_acl.c:148:3: warning: value computed is not used [-Wunused-value] /kisskb/src/drivers/net/macsec.c: In function 'macsec_del_txsa': /kisskb/src/drivers/net/macsec.c:1995:2: warning: 'assoc_num' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c:1995:2: warning: 'tx_sc' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c: In function 'macsec_upd_txsa': /kisskb/src/drivers/net/macsec.c:2060:5: warning: 'assoc_num' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c:2060:24: warning: 'tx_sc' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c:2061:21: warning: 'secy' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c: In function 'macsec_del_rxsa': /kisskb/src/drivers/net/macsec.c:1918:2: warning: 'assoc_num' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c:1918:2: warning: 'rx_sc' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c: In function 'tun_get_user': /kisskb/src/drivers/net/tun.c:1836:30: warning: 'copylen' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1526:31: warning: 'linear' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1749:46: note: 'linear' was declared here /kisskb/src/net/sctp/output.c: In function 'sctp_packet_config': /kisskb/src/include/net/sock.h:1960:19: warning: 'sk' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/sctp/output.c:79:15: note: 'sk' was declared here drivers/video/fbdev/c2p_planar.o: In function `transp8': c2p_planar.c:(.text+0xd6): undefined reference to `c2p_unsupported' c2p_planar.c:(.text+0x1dc): undefined reference to `c2p_unsupported' drivers/video/fbdev/c2p_iplan2.o: In function `get_mask': c2p_iplan2.c:(.text+0xc4): undefined reference to `c2p_unsupported' drivers/video/fbdev/c2p_iplan2.o: In function `transp4': c2p_iplan2.c:(.text+0x150): undefined reference to `c2p_unsupported' make[1]: *** [/kisskb/src/Makefile:1094: vmlinux] Error 1 make: *** [Makefile:179: sub-make] Error 2 Command 'make -s -j 24 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_m68k-defconfig_m68k # Build took: 0:01:32.646007