# 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 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # yes \n | make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- oldconfig yes: standard output: Broken pipe # make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_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] /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^~~~~~~ In file included from /kisskb/src/arch/mips/include/asm/page.h:261, from /kisskb/src/arch/mips/include/asm/io.h:29, from /kisskb/src/arch/mips/include/asm/mmiowb.h:5, from /kisskb/src/include/linux/spinlock.h:60, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/net.h:19, from /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c:8: /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c: In function 'siw_tx_hdt': /kisskb/src/arch/mips/include/asm/page.h:249:53: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) ^ /kisskb/src/include/asm-generic/memory_model.h:33:41: note: in definition of macro '__pfn_to_page' #define __pfn_to_page(pfn) (mem_map + ((pfn) - ARCH_PFN_OFFSET)) ^~~ /kisskb/src/arch/mips/include/asm/page.h:249:31: note: in expansion of macro 'PFN_DOWN' #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) ^~~~~~~~ /kisskb/src/arch/mips/include/asm/page.h:250:41: note: in expansion of macro 'virt_to_pfn' #define virt_to_page(kaddr) pfn_to_page(virt_to_pfn(kaddr)) ^~~~~~~~~~~ /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c:528:23: note: in expansion of macro 'virt_to_page' page_array[seg] = virt_to_page(va & PAGE_MASK); ^~~~~~~~~~~~ /kisskb/src/drivers/spi/spi-sh-msiof.c:76: warning: "STR" redefined #define STR 0x40 /* Status Register */ In file included from /kisskb/src/arch/mips/include/asm/mach-generic/spaces.h:15, from /kisskb/src/arch/mips/include/asm/addrspace.h:13, from /kisskb/src/arch/mips/include/asm/barrier.h:11, from /kisskb/src/include/linux/compiler.h:256, from /kisskb/src/arch/mips/include/asm/bitops.h:16, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/include/linux/bitmap.h:8, from /kisskb/src/drivers/spi/spi-sh-msiof.c:10: /kisskb/src/arch/mips/include/asm/mipsregs.h:30: note: this is the location of the previous definition #define STR(x) __STR(x) In file included from /kisskb/src/drivers/net/phy/mdio-cavium.c:11: /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_set_mode': /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:21:16: note: in expansion of macro 'oct_mdio_readq' smi_clk.u64 = oct_mdio_readq(p->register_base + SMI_CLK); ^~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:24:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_clk.u64, p->register_base + SMI_CLK); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_c45_addr': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:39:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_wr.u64, p->register_base + SMI_WR_DAT); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:47:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_cmd.u64, p->register_base + SMI_CMD); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:54:16: note: in expansion of macro 'oct_mdio_readq' smi_wr.u64 = oct_mdio_readq(p->register_base + SMI_WR_DAT); ^~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_read': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:86:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_cmd.u64, p->register_base + SMI_CMD); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:93:16: note: in expansion of macro 'oct_mdio_readq' smi_rd.u64 = oct_mdio_readq(p->register_base + SMI_RD_DAT); ^~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_write': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:125:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_wr.u64, p->register_base + SMI_WR_DAT); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:131:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_cmd.u64, p->register_base + SMI_CMD); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:138:16: note: in expansion of macro 'oct_mdio_readq' smi_wr.u64 = oct_mdio_readq(p->register_base + SMI_WR_DAT); ^~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-octeon.c: In function 'octeon_mdiobus_probe': /kisskb/src/drivers/net/phy/mdio-octeon.c:48:3: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] (u64)devm_ioremap(&pdev->dev, mdio_phys, regsize); ^ In file included from /kisskb/src/drivers/net/phy/mdio-octeon.c:14: /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-octeon.c:56:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-octeon.c:77:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-octeon.c: In function 'octeon_mdiobus_remove': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-octeon.c:91:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/mips/include/asm/octeon/octeon.h:11, from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:19, from /kisskb/src/drivers/staging/octeon/ethernet.c:22: /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_writeq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:282:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] cvmx_write_csr((__force uint64_t)csr_addr, val); ^ /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_readq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:299:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return cvmx_read_csr((__force uint64_t) csr_addr); ^ In file included from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:27, from /kisskb/src/drivers/staging/octeon/ethernet.c:22: /kisskb/src/arch/mips/include/asm/octeon/cvmx-ipd.h: In function 'cvmx_ipd_free_ptr': /kisskb/src/arch/mips/include/asm/octeon/cvmx-ipd.h:330:27: error: storage size of 'pip_sft_rst' isn't known union cvmx_pip_sft_rst pip_sft_rst; ^~~~~~~~~~~ /kisskb/src/arch/mips/include/asm/octeon/cvmx-ipd.h:331:36: error: 'CVMX_PIP_SFT_RST' undeclared (first use in this function); did you mean 'CVMX_CIU_SOFT_RST'? pip_sft_rst.u64 = cvmx_read_csr(CVMX_PIP_SFT_RST); ^~~~~~~~~~~~~~~~ CVMX_CIU_SOFT_RST /kisskb/src/arch/mips/include/asm/octeon/cvmx-ipd.h:331:36: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/arch/mips/include/asm/octeon/cvmx-ipd.h:330:27: warning: unused variable 'pip_sft_rst' [-Wunused-variable] union cvmx_pip_sft_rst pip_sft_rst; ^~~~~~~~~~~ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:261: warning: "M_SPC_CFG_CLEAR" redefined #define M_SPC_CFG_CLEAR M_BCM1480_SPC_CFG_CLEAR In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:392: note: this is the location of the previous definition #define M_SPC_CFG_CLEAR _SB_MAKEMASK1(32) In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:262: warning: "M_SPC_CFG_ENABLE" redefined #define M_SPC_CFG_ENABLE M_BCM1480_SPC_CFG_ENABLE In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:393: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) make[4]: *** [/kisskb/src/scripts/Makefile.build:266: drivers/staging/octeon/ethernet.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:509: drivers/staging/octeon] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:509: drivers/staging] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c: In function 'mlx5e_grp_sw_update_stats': /kisskb/src/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c:300:1: warning: the frame size of 1152 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c: In function '__stmmac_test_l4filt': /kisskb/src/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c:1443:1: warning: the frame size of 1168 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c: In function '__stmmac_test_l3filt': /kisskb/src/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c:1314:1: warning: the frame size of 1168 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ In file included from /kisskb/src/drivers/net/wireless/zydas/zd1211rw/zd_usb.c:22: /kisskb/src/drivers/net/wireless/zydas/zd1211rw/zd_usb.c: In function 'check_read_regs': /kisskb/src/drivers/net/wireless/zydas/zd1211rw/zd_def.h:18:25: warning: format '%ld' expects argument of type 'long int', but argument 6 has type 'size_t' {aka 'unsigned int'} [-Wformat=] dev_printk(level, dev, "%s() " fmt, __func__, ##args) ^~~~~~~ /kisskb/src/drivers/net/wireless/zydas/zd1211rw/zd_def.h:22:4: note: in expansion of macro 'dev_printk_f' dev_printk_f(KERN_DEBUG, dev, fmt, ## args) ^~~~~~~~~~~~ /kisskb/src/drivers/net/wireless/zydas/zd1211rw/zd_usb.c:1635:3: note: in expansion of macro 'dev_dbg_f' dev_dbg_f(zd_usb_dev(usb), ^~~~~~~~~ /kisskb/src/drivers/net/wireless/zydas/zd1211rw/zd_usb.c:1636:51: note: format string is defined here "error: actual length %d less than expected %ld\n", ~~^ %d make[1]: *** [/kisskb/src/Makefile:1670: drivers] Error 2 make: *** [Makefile:179: sub-make] Error 2 Command 'make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:20:11.076898