All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Garrett <matthewgarrett@google.com>
To: jmorris@namei.org
Cc: linux-security-module@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-api@vger.kernel.org,
	Josh Boyer <jwboyer@fedoraproject.org>,
	David Howells <dhowells@redhat.com>,
	Matthew Garrett <mjg59@google.com>,
	Kees Cook <keescook@chromium.org>,
	rjw@rjwysocki.net, pavel@ucw.cz, linux-pm@vger.kernel.org
Subject: [PATCH V36 10/29] hibernate: Disable when the kernel is locked down
Date: Thu, 18 Jul 2019 12:43:56 -0700	[thread overview]
Message-ID: <20190718194415.108476-11-matthewgarrett@google.com> (raw)
In-Reply-To: <20190718194415.108476-1-matthewgarrett@google.com>

From: Josh Boyer <jwboyer@fedoraproject.org>

There is currently no way to verify the resume image when returning
from hibernate.  This might compromise the signed modules trust model,
so until we can work with signed hibernate images we disable it when the
kernel is locked down.

Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Matthew Garrett <mjg59@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Cc: rjw@rjwysocki.net
Cc: pavel@ucw.cz
cc: linux-pm@vger.kernel.org
---
 include/linux/security.h     | 1 +
 kernel/power/hibernate.c     | 3 ++-
 security/lockdown/lockdown.c | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/linux/security.h b/include/linux/security.h
index 69c5de539e9a..304a155a5628 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -106,6 +106,7 @@ enum lockdown_reason {
 	LOCKDOWN_MODULE_SIGNATURE,
 	LOCKDOWN_DEV_MEM,
 	LOCKDOWN_KEXEC,
+	LOCKDOWN_HIBERNATION,
 	LOCKDOWN_INTEGRITY_MAX,
 	LOCKDOWN_CONFIDENTIALITY_MAX,
 };
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index cd7434e6000d..3c0a5a8170b0 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -30,6 +30,7 @@
 #include <linux/ctype.h>
 #include <linux/genhd.h>
 #include <linux/ktime.h>
+#include <linux/security.h>
 #include <trace/events/power.h>
 
 #include "power.h"
@@ -68,7 +69,7 @@ static const struct platform_hibernation_ops *hibernation_ops;
 
 bool hibernation_available(void)
 {
-	return (nohibernate == 0);
+	return nohibernate == 0 && !security_locked_down(LOCKDOWN_HIBERNATION);
 }
 
 /**
diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c
index 6f302c156bc8..a0996f75629f 100644
--- a/security/lockdown/lockdown.c
+++ b/security/lockdown/lockdown.c
@@ -21,6 +21,7 @@ static char *lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1] = {
 	[LOCKDOWN_MODULE_SIGNATURE] = "unsigned module loading",
 	[LOCKDOWN_DEV_MEM] = "/dev/mem,kmem,port",
 	[LOCKDOWN_KEXEC] = "kexec of unsigned images",
+	[LOCKDOWN_HIBERNATION] = "hibernation",
 	[LOCKDOWN_INTEGRITY_MAX] = "integrity",
 	[LOCKDOWN_CONFIDENTIALITY_MAX] = "confidentiality",
 };
-- 
2.22.0.510.g264f2c817a-goog


  parent reply	other threads:[~2019-07-18 19:46 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-18 19:43 [PATCH V36 00/29] security: Add kernel lockdown functionality Matthew Garrett
2019-07-18 19:43 ` [PATCH V36 01/29] security: Support early LSMs Matthew Garrett
2019-07-18 20:02   ` Casey Schaufler
2019-07-18 19:43 ` [PATCH V36 02/29] security: Add a "locked down" LSM hook Matthew Garrett
2019-07-18 20:03   ` Casey Schaufler
2019-07-18 19:43 ` [PATCH V36 03/29] security: Add a static lockdown policy LSM Matthew Garrett
2019-07-18 19:43 ` [PATCH V36 04/29] Enforce module signatures if the kernel is locked down Matthew Garrett
2019-07-18 19:43 ` [PATCH V36 05/29] Restrict /dev/{mem,kmem,port} when " Matthew Garrett
2019-07-18 19:43 ` [PATCH V36 06/29] kexec_load: Disable at runtime if " Matthew Garrett
2019-07-18 19:43   ` Matthew Garrett
2019-07-18 19:43 ` [PATCH V36 07/29] Copy secure_boot flag in boot params across kexec reboot Matthew Garrett
2019-07-18 19:43   ` Matthew Garrett
2019-07-18 19:43 ` [PATCH V36 08/29] kexec_file: split KEXEC_VERIFY_SIG into KEXEC_SIG and KEXEC_SIG_FORCE Matthew Garrett
2019-07-18 19:43   ` Matthew Garrett
2019-07-18 19:43   ` Matthew Garrett
2019-07-18 19:43 ` [PATCH V36 09/29] kexec_file: Restrict at runtime if the kernel is locked down Matthew Garrett
2019-07-18 19:43   ` Matthew Garrett
2019-07-18 19:43 ` Matthew Garrett [this message]
2019-07-18 19:43 ` [PATCH V36 11/29] PCI: Lock down BAR access when " Matthew Garrett
2019-07-18 19:43 ` [PATCH V36 12/29] x86: Lock down IO port " Matthew Garrett
2019-07-18 19:43 ` [PATCH V36 13/29] x86/msr: Restrict MSR " Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 14/29] ACPI: Limit access to custom_method " Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 15/29] acpi: Ignore acpi_rsdp kernel param when the kernel has been " Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 16/29] acpi: Disable ACPI table override if the kernel is " Matthew Garrett
2019-07-18 19:44   ` Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 17/29] Prohibit PCMCIA CIS storage when " Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 18/29] Lock down TIOCSSERIAL Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 19/29] Lock down module params that specify hardware parameters (eg. ioport) Matthew Garrett
2019-07-29 21:47   ` Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 20/29] x86/mmiotrace: Lock down the testmmiotrace module Matthew Garrett
2019-07-18 21:06   ` Kees Cook
2019-07-18 19:44 ` [PATCH V36 21/29] Lock down /proc/kcore Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 22/29] Lock down tracing and perf kprobes when in confidentiality mode Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 23/29] bpf: Restrict bpf when kernel lockdown is " Matthew Garrett
2019-07-18 21:06   ` Kees Cook
2019-07-29 21:47   ` Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 24/29] Lock down perf when " Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 25/29] kexec: Allow kexec_file() with appropriate IMA policy when locked down Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 26/29] debugfs: Restrict debugfs when the kernel is " Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 27/29] tracefs: Restrict tracefs " Matthew Garrett
2019-07-25  2:23   ` Steven Rostedt
2019-07-30 18:47     ` [PATCH] " Matthew Garrett
2019-07-31  1:48       ` Steven Rostedt
2019-07-18 19:44 ` [PATCH V36 28/29] efi: Restrict efivar_ssdt_load " Matthew Garrett
2019-07-18 19:44 ` [PATCH V36 29/29] lockdown: Print current->comm in restriction messages Matthew Garrett

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190718194415.108476-11-matthewgarrett@google.com \
    --to=matthewgarrett@google.com \
    --cc=dhowells@redhat.com \
    --cc=jmorris@namei.org \
    --cc=jwboyer@fedoraproject.org \
    --cc=keescook@chromium.org \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=mjg59@google.com \
    --cc=pavel@ucw.cz \
    --cc=rjw@rjwysocki.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.