Commit 38bd94b8 authored by Josh Boyer's avatar Josh Boyer Committed by James Morris
Browse files

hibernate: Disable when the kernel is locked down 



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: default avatarJosh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarMatthew Garrett <mjg59@google.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Cc: rjw@rjwysocki.net
Cc: pavel@ucw.cz
cc: linux-pm@vger.kernel.org
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 155bdd30

include/linux/security.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,7 @@ enum lockdown_reason { 
	LOCKDOWN_MODULE_SIGNATURE,

	LOCKDOWN_MODULE_SIGNATURE,

	LOCKDOWN_DEV_MEM,

	LOCKDOWN_DEV_MEM,

	LOCKDOWN_KEXEC,

	LOCKDOWN_KEXEC,

	LOCKDOWN_HIBERNATION,

	LOCKDOWN_INTEGRITY_MAX,

	LOCKDOWN_INTEGRITY_MAX,

	LOCKDOWN_CONFIDENTIALITY_MAX,

	LOCKDOWN_CONFIDENTIALITY_MAX,

};

};

kernel/power/hibernate.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/ctype.h>

#include <linux/ctype.h>

#include <linux/genhd.h>

#include <linux/genhd.h>

#include <linux/ktime.h>

#include <linux/ktime.h>

#include <linux/security.h>

#include <trace/events/power.h>

#include <trace/events/power.h>





#include "power.h"

#include "power.h"
@@ -68,7 +69,7 @@ static const struct platform_hibernation_ops *hibernation_ops; 




bool hibernation_available(void)

bool hibernation_available(void)

{

{

	return (nohibernate == 0);

	return nohibernate == 0 && !security_locked_down(LOCKDOWN_HIBERNATION);

}

}





/**

/**

security/lockdown/lockdown.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ static char *lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1] = { 
	[LOCKDOWN_MODULE_SIGNATURE] = "unsigned module loading",

	[LOCKDOWN_MODULE_SIGNATURE] = "unsigned module loading",

	[LOCKDOWN_DEV_MEM] = "/dev/mem,kmem,port",

	[LOCKDOWN_DEV_MEM] = "/dev/mem,kmem,port",

	[LOCKDOWN_KEXEC] = "kexec of unsigned images",

	[LOCKDOWN_KEXEC] = "kexec of unsigned images",

	[LOCKDOWN_HIBERNATION] = "hibernation",

	[LOCKDOWN_INTEGRITY_MAX] = "integrity",

	[LOCKDOWN_INTEGRITY_MAX] = "integrity",

	[LOCKDOWN_CONFIDENTIALITY_MAX] = "confidentiality",

	[LOCKDOWN_CONFIDENTIALITY_MAX] = "confidentiality",

};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE