[PATCH 0/2] Minor lockdown fixups
From: Matthew Garrett <hidden>
Date: 2019-09-10 10:03:27
Constify some arrays and fix an #ifdef that I typoed.
[PATCH 0/2] Minor lockdown fixups
STALE2524d
4 messages, 2 authors, 2019-09-10 · open the first message on its own page
[PATCH 1/2] security: constify some arrays in lockdown LSM
From: Matthew Garrett <hidden>
Date: 2019-09-10 10:03:28
No reason for these not to be const. Signed-off-by: Matthew Garrett <redacted> Suggested-by: David Howells <dhowells@redhat.com> --- security/lockdown/lockdown.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c
index 0068cec77c05..8a10b43daf74 100644
--- a/security/lockdown/lockdown.c
+++ b/security/lockdown/lockdown.c@@ -16,7 +16,7 @@ static enum lockdown_reason kernel_locked_down; -static char *lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1] = { +static const char *const lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1] = { [LOCKDOWN_NONE] = "none", [LOCKDOWN_MODULE_SIGNATURE] = "unsigned module loading", [LOCKDOWN_DEV_MEM] = "/dev/mem,kmem,port",
@@ -40,7 +40,7 @@ static char *lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1] = { [LOCKDOWN_CONFIDENTIALITY_MAX] = "confidentiality", }; -static enum lockdown_reason lockdown_levels[] = {LOCKDOWN_NONE, +static const enum lockdown_reason lockdown_levels[] = {LOCKDOWN_NONE, LOCKDOWN_INTEGRITY_MAX, LOCKDOWN_CONFIDENTIALITY_MAX};
--
2.23.0.162.g0b9fbb3734-goog[PATCH 2/2] kexec: Fix file verification on S390
From: Matthew Garrett <hidden>
Date: 2019-09-10 10:03:31
I accidentally typoed this #ifdef, so verification would always be disabled. Signed-off-by: Matthew Garrett <redacted> Reported-by: Philipp Rudo <redacted> --- arch/s390/kernel/kexec_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/s390/kernel/kexec_elf.c b/arch/s390/kernel/kexec_elf.c
index 9b4f37a4edf1..9da6fa30c447 100644
--- a/arch/s390/kernel/kexec_elf.c
+++ b/arch/s390/kernel/kexec_elf.c@@ -130,7 +130,7 @@ static int s390_elf_probe(const char *buf, unsigned long len) const struct kexec_file_ops s390_kexec_elf_ops = { .probe = s390_elf_probe, .load = s390_elf_load, -#ifdef CONFIG_KEXEC__SIG +#ifdef CONFIG_KEXEC_SIG .verify_sig = s390_verify_sig, #endif /* CONFIG_KEXEC_SIG */ };
--
2.23.0.162.g0b9fbb3734-googRe: [PATCH 0/2] Minor lockdown fixups
From: James Morris <jmorris@namei.org>
Date: 2019-09-10 12:30:07
On Tue, 10 Sep 2019, Matthew Garrett wrote:
Constify some arrays and fix an #ifdef that I typoed.
Applied to git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-lockdown and next-testing -- James Morris [off-list ref]