Linus Torvalds
f1f2f614d5
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
2019-09-27 19:37:27 -07:00
locking/atomics: Use sed(1) instead of non-standard head(1) option
2019-06-25 10:17:07 +02:00
kbuild: remove unneeded comments and code from scripts/basic/Makefile
2019-08-29 23:54:29 +09:00
Modules updates for v5.4
2019-09-22 10:34:46 -07:00
Devicetree updates for v5.3:
2019-07-11 18:35:30 -07:00
randstruct: Check member structs in is_pure_ops_struct()
2019-07-31 13:13:22 -07:00
scripts/gdb: handle split debug
2019-09-25 17:51:40 -07:00
genksyms: convert to SPDX License Identifier for lex.l and parse.y
2019-09-14 11:40:13 +09:00
merge_config.sh: ignore unwanted grep errors
2019-09-04 23:12:50 +09:00
Modules updates for v5.4
2019-09-22 10:34:46 -07:00
kbuild: pkg: rename scripts/package/Makefile to scripts/Makefile.package
2019-08-25 07:42:00 +09:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156
2019-05-30 11:26:35 -07:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
2019-05-30 11:26:39 -07:00
scripts: remove unnecessary ihex2fw and check-lc_ctypes from .gitignore
2018-12-22 00:37:52 +09:00
kbuild: remove the first line of *.mod files
2019-07-18 02:19:31 +09:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 36
2019-05-24 17:27:11 +02:00
bloat-o-meter: ignore __addressable_ symbols
2018-12-28 12:11:44 -08:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 391
2019-06-05 17:37:11 +02:00
bpf: fix script for generating man page on BPF helpers
2019-05-13 01:12:45 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
2019-05-30 11:26:39 -07:00
checkpatch: check for nested (un)?likely() calls
2019-09-25 17:51:42 -07:00
scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
2019-06-05 02:33:10 +09:00
checksyscalls: fix up mq_timedreceive and stat exceptions
2019-02-19 21:27:53 +01:00
kbuild: update comment block of scripts/clang-version.sh
2019-03-04 22:34:54 +09:00
coccicheck: return proper error code on fail
2018-08-14 08:58:56 +09:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 54
2019-05-24 17:36:42 +02:00
scripts/decode_stacktrace: Accept dash/underscore in modules
2019-07-12 11:05:41 -07:00
scripts/decodecode: set ARCH when running natively on arm/arm64
2018-12-28 12:11:44 -08:00
kbuild: modules_install: warn when missing System.map file
2018-09-09 09:14:07 +09:00
scripts/documentation-file-ref-check: ignore output dir
2019-06-14 14:43:01 -06:00
modpost: add support for symbol namespaces
2019-09-10 10:30:21 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 378
2019-06-05 17:37:10 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 339
2019-06-05 17:37:07 +02:00
scripts/faddr2line: fix location of start_kernel in comment
2018-11-18 10:15:09 -08:00
jump_label: move 'asm goto' support test to Kconfig
2019-01-06 09:46:51 +09:00
kbuild: clean up scripts/gcc-version.sh
2019-03-04 22:35:04 +09:00
gen_compile_commands: lower the entry count threshold
2019-07-27 12:18:19 +09:00
kbuild: simplify dependency generation for CONFIG_TRIM_UNUSED_KSYMS
2018-12-01 23:13:14 +09:00
doc: ABI scripts: add a SPDX header file
2019-06-21 16:58:37 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 61
2019-05-24 17:36:45 +02:00
get_maintainer: add ability to skip moderated mailing lists
2019-07-16 19:23:22 -07:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
2019-05-30 11:26:39 -07:00
kbuild: re-implement detection of CONFIG options leaked to user-space
2019-08-21 21:05:21 +09:00
kallsyms: exclude kasan local symbols on s390
2019-07-08 02:25:59 +09:00
kbuild: remove unused objectify macro
2019-07-27 12:18:19 +09:00
kbuild: Fail if gold linker is detected
2019-08-14 01:10:42 +09:00
kernel-doc: Allow anonymous enum
2019-08-12 15:00:37 -06:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
2019-05-30 11:26:39 -07:00
Kbuild updates for v5.4
2019-09-20 08:36:47 -07:00
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
2019-09-27 19:37:27 -07:00
kbuild: force all architectures except um to include mandatory-y
2019-03-17 12:56:32 +09:00
kbuild: rename KBUILD_ENABLE_EXTRA_GCC_CHECKS to KBUILD_EXTRA_WARN
2019-09-06 23:46:52 +09:00
kbuild: clean up subdir-ymn calculation in Makefile.clean
2019-08-29 23:54:29 +09:00
kbuild: allow Clang to find unused static inline functions for W=1 build
2019-09-09 23:55:43 +09:00
gcc-plugins: structleak: Generalize to all variable types
2019-03-04 09:29:41 -08:00
kbuild: fix 'No such file or directory' warning for headers_install
2019-06-24 03:43:03 +09:00
kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)
2019-09-04 23:12:50 +09:00
kasan/arm64: fix CONFIG_KASAN_SW_TAGS && KASAN_INLINE
2019-08-15 13:24:04 +01:00
treewide: Add SPDX license identifier - Makefile/Kconfig
2019-05-21 10:50:46 +02:00
kbuild: rename KBUILD_ENABLE_EXTRA_GCC_CHECKS to KBUILD_EXTRA_WARN
2019-09-06 23:46:52 +09:00
kbuild: get rid of kernel/ prefix from in-tree modules.{order,builtin}
2019-07-17 22:39:27 +09:00
kbuild: move modkern_{c,a}flags to Makefile.lib from Makefile.build
2019-08-22 01:14:11 +09:00
kbuild: modinst: read modules.order instead of $(MODVERDIR)/*.mod
2019-07-17 22:39:27 +09:00
Modules updates for v5.4
2019-09-22 10:34:46 -07:00
kbuild: modsign: read modules.order instead of $(MODVERDIR)/*.mod
2019-07-17 22:39:27 +09:00
kbuild: pkg: rename scripts/package/Makefile to scripts/Makefile.package
2019-08-25 07:42:00 +09:00
ubsan: Remove vla bound checks.
2019-05-06 11:12:09 -07:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 373
2019-06-05 17:37:10 +02:00
Kbuild: Handle PREEMPT_RT for version string and magic
2019-08-14 01:10:42 +09:00
kbuild: get rid of $(realpath ...) from scripts/mkmakefile
2019-08-29 23:54:29 +09:00
kbuild: get rid of kernel/ prefix from in-tree modules.{order,builtin}
2019-07-17 22:39:27 +09:00
scripts: Coccinelle script for namespace dependencies.
2019-09-10 10:30:43 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 199
2019-05-30 11:29:23 -07:00
recordmcount: Clarify what cleanup() does
2019-08-31 12:19:40 -04:00
recordmcount: Remove redundant cleanup() calls
2019-08-31 12:19:40 -04:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
2019-05-30 11:26:39 -07:00
scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks
2018-11-21 23:57:33 +09:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 438
2019-06-05 17:37:17 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 378
2019-06-05 17:37:10 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 378
2019-06-05 17:37:10 +02:00
scripts: add spdxcheck.py self test
2018-12-28 12:11:44 -08:00
spdxcheck.py: fix directory structures
2019-06-01 15:51:31 -07:00
scripts/spelling.txt: add more spellings to spelling.txt
2019-07-12 11:05:41 -07:00
scripts/sphinx-pre-install: seek for Noto CJK fonts for pdf output
2019-07-17 06:57:52 -03:00
selftests: add headers_install to lib.mk
2018-09-05 08:12:09 -06:00
kbuild: add a flag to force absolute path for srctree
2019-07-11 00:05:09 +09:00
arm64: Add support for relocating the kernel with RELR relocations
2019-08-05 12:35:35 +01:00
unifdef: use memcpy instead of strncpy
2018-11-30 14:45:01 -08:00
ver_linux: Assign constant RE to variable name for clarity
2019-01-22 13:34:35 +01:00
f1f2f614d5