Changes in Makefile

b746a1a2860f4a918f32d10dc569115d282aaf2f - Merge branch 'for-5.5/core' into for-linus

Fri, 29 Nov 2019 20:34:28 +0100

Merge branch 'for-5.5/core' into for-linus- hid_have_special_driver[] cleanup for LED devices (Heiner Kallweit)- HID parser improvements (Blaž Hrastnik, Candle Sun) List of files: /linux/security/lockdown/Makefile

976e3645923bdd2fe7893aae33fd7a21098bfb28 - Merge branch 'next' into for-linus

Mon, 25 Nov 2019 22:26:56 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.5 merge window. List of files: /linux/security/lockdown/Makefile

9f4813b531a0b8cc502fcfb142937fe4e9104d77 - Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixes

Tue, 19 Nov 2019 09:00:45 +0100

Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/security/lockdown/Makefile

ac94be498f84f7327533b62faca4c3da64434904 - Merge branch 'linus' into x86/hyperv

Fri, 15 Nov 2019 10:30:50 +0100

Merge branch 'linus' into x86/hypervPick up upstream fixes to avoid conflicts. List of files: /linux/security/lockdown/Makefile

728d90bdc9e480dc93913e59a0aa3c896c7aa697 - Merge tag 'v5.4-rc5' into next

Sun, 27 Oct 2019 19:00:19 +0100

Merge tag 'v5.4-rc5' into nextSync up with mainline. List of files: /linux/security/lockdown/Makefile

112d6212c80a1c560757520bd822a41c0ad15c2c - Merge tag 'v5.4-rc3' into spi-5.4

Fri, 18 Oct 2019 19:30:49 +0200

Merge tag 'v5.4-rc3' into spi-5.4Linux 5.4-rc3 List of files: /linux/security/lockdown/Makefile

fa41d6ee904266fa8739cafa6ec038c3a8e435b7 - Merge drm/drm-next into drm-intel-next-queued

Tue, 15 Oct 2019 10:18:26 +0200

Merge drm/drm-next into drm-intel-next-queuedBackmerging to pull in HDR DP code:https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.htmlSigned-off-by: Joonas Lahtinen List of files: /linux/security/lockdown/Makefile

1913c7f3fc2514e09262baf2267a82dfdb215c39 - Merge tag 'fix-missing-panels' into fixes

Fri, 04 Oct 2019 18:06:41 +0200

Merge tag 'fix-missing-panels' into fixes List of files: /linux/security/lockdown/Makefile

4092de1ba34eb376791809fb366bc15f8a9e0b7c - Merge drm/drm-next into drm-misc-next

Thu, 03 Oct 2019 16:38:50 +0200

Merge drm/drm-next into drm-misc-nextWe haven't done any backmerge for a while due to the merge window, and itstarts to become an issue for komeda. Let's bring 5.4-rc1 in.Signed-off-by: Maxime Ripard List of files: /linux/security/lockdown/Makefile

77fdaa091d79c87323a9f3912a25f73e02ea2a01 - Merge drm/drm-fixes into drm-misc-fixes

Thu, 03 Oct 2019 09:59:29 +0200

Merge drm/drm-fixes into drm-misc-fixesWe haven't backmerged for a while, let's start the -rc period by pullingrc1.Signed-off-by: Maxime Ripard List of files: /linux/security/lockdown/Makefile

aefcf2f4b58155d27340ba5f9ddbe9513da8286d - Merge branch 'next-lockdown' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Sat, 28 Sep 2019 17:14:15 +0200

Merge branch 'next-lockdown' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-securityPull kernel lockdown mode from James Morris: "This is the latest iteration of the kernel lockdown patchset, from Matthew Garrett, David Howells and others. From the original description: This patchset introduces an optional kernel lockdown feature, intended to strengthen the boundary between UID 0 and the kernel. When enabled, various pieces of kernel functionality are restricted. Applications that rely on low-level access to either hardware or the kernel may cease working as a result - therefore this should not be enabled without appropriate evaluation beforehand. The majority of mainstream distributions have been carrying variants of this patchset for many years now, so there's value in providing a doesn't meet every distribution requirement, but gets us much closer to not requiring external patches. There are two major changes since this was last proposed for mainline: - Separating lockdown from EFI secure boot. Background discussion is covered here: https://lwn.net/Articles/751061/ - Implementation as an LSM, with a default stackable lockdown LSM module. This allows the lockdown feature to be policy-driven, rather than encoding an implicit policy within the mechanism. The new locked_down LSM hook is provided to allow LSMs to make a policy decision around whether kernel functionality that would allow tampering with or examining the runtime state of the kernel should be permitted. The included lockdown LSM provides an implementation with a simple policy intended for general purpose use. This policy provides a coarse level of granularity, controllable via the kernel command line: lockdown={integrity|confidentiality} Enable the kernel lockdown feature. If set to integrity, kernel features that allow userland to modify the running kernel are disabled. If set to confidentiality, kernel features that allow userland to extract confidential information from the kernel are also disabled. This may also be controlled via /sys/kernel/security/lockdown and overriden by kernel configuration. New or existing LSMs may implement finer-grained controls of the lockdown features. Refer to the lockdown_reason documentation in include/linux/security.h for details. The lockdown feature has had signficant design feedback and review across many subsystems. This code has been in linux-next for some weeks, with a few fixes applied along the way. Stephen Rothwell noted that commit 9d1f8be5cf42 ("bpf: Restrict bpf when kernel lockdown is in confidentiality mode") is missing a Signed-off-by from its author. Matthew responded that he is providing this under category (c) of the DCO"* 'next-lockdown' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (31 commits) kexec: Fix file verification on S390 security: constify some arrays in lockdown LSM lockdown: Print current->comm in restriction messages efi: Restrict efivar_ssdt_load when the kernel is locked down tracefs: Restrict tracefs when the kernel is locked down debugfs: Restrict debugfs when the kernel is locked down kexec: Allow kexec_file() with appropriate IMA policy when locked down lockdown: Lock down perf when in confidentiality mode bpf: Restrict bpf when kernel lockdown is in confidentiality mode lockdown: Lock down tracing and perf kprobes when in confidentiality mode lockdown: Lock down /proc/kcore x86/mmiotrace: Lock down the testmmiotrace module lockdown: Lock down module params that specify hardware parameters (eg. ioport) lockdown: Lock down TIOCSSERIAL lockdown: Prohibit PCMCIA CIS storage when the kernel is locked down acpi: Disable ACPI table override if the kernel is locked down acpi: Ignore acpi_rsdp kernel param when the kernel has been locked down ACPI: Limit access to custom_method when the kernel is locked down x86/msr: Restrict MSR access when the kernel is locked down x86: Lock down IO port access when the kernel is locked down ... List of files: /linux/security/lockdown/Makefile

000d388ed3bbed745f366ce71b2bb7c2ee70f449 - security: Add a static lockdown policy LSM

Tue, 20 Aug 2019 02:17:39 +0200

security: Add a static lockdown policy LSMWhile existing LSMs can be extended to handle lockdown policy,distributions generally want to be able to apply a straightforwardstatic policy. This patch adds a simple LSM that can be configured toreject either integrity or all lockdown queries, and can be configuredat runtime (through securityfs), boot time (via a kernel parameter) orbuild time (via a kconfig option). Based on initial code by DavidHowells.Signed-off-by: Matthew Garrett Reviewed-by: Kees Cook Cc: David Howells Signed-off-by: James Morris List of files: /linux/security/lockdown/Makefile