68d0d67
Bugzilla: N/A
68d0d67
Upstream-status: Fedora mustard.  Replaced by securelevels, but that was nak'd
68d0d67
7583b10
7583b10
From 3b083aa4b42c6f2e814742b24e1948aced3a5e3f Mon Sep 17 00:00:00 2001
Josh Boyer c9d9c5a
From: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer d7ee6f3
Date: Fri, 9 Aug 2013 17:58:15 -0400
Josh Boyer d7ee6f3
Subject: [PATCH 01/14] Add secure_modules() call
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Provide a single call to allow kernel code to determine whether the system
Josh Boyer c9d9c5a
has been configured to either disable module loading entirely or to load
Josh Boyer c9d9c5a
only modules signed with a trusted key.
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer c9d9c5a
---
Josh Boyer c9d9c5a
 include/linux/module.h |  7 +++++++
Josh Boyer c9d9c5a
 kernel/module.c        | 10 ++++++++++
Josh Boyer c9d9c5a
 2 files changed, 17 insertions(+)
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
diff --git a/include/linux/module.h b/include/linux/module.h
Josh Boyer 700baa3
index f520a767c86c..fc9b54eb779e 100644
Josh Boyer c9d9c5a
--- a/include/linux/module.h
Josh Boyer c9d9c5a
+++ b/include/linux/module.h
Josh Boyer 700baa3
@@ -509,6 +509,8 @@ int unregister_module_notifier(struct notifier_block *nb);
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 extern void print_modules(void);
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+extern bool secure_modules(void);
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 #else /* !CONFIG_MODULES... */
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 /* Given an address, look for it in the exception tables. */
Josh Boyer 700baa3
@@ -619,6 +621,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
Josh Boyer c9d9c5a
 static inline void print_modules(void)
Josh Boyer c9d9c5a
 {
Josh Boyer c9d9c5a
 }
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
+static inline bool secure_modules(void)
Josh Boyer c9d9c5a
+{
Josh Boyer c9d9c5a
+	return false;
Josh Boyer c9d9c5a
+}
Josh Boyer c9d9c5a
 #endif /* CONFIG_MODULES */
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 #ifdef CONFIG_SYSFS
Josh Boyer c9d9c5a
diff --git a/kernel/module.c b/kernel/module.c
79d682f
index 81e727cf6df9..fc14f48915dd 100644
Josh Boyer c9d9c5a
--- a/kernel/module.c
Josh Boyer c9d9c5a
+++ b/kernel/module.c
79d682f
@@ -3843,3 +3843,13 @@ void module_layout(struct module *mod,
Josh Boyer c9d9c5a
 }
Josh Boyer c9d9c5a
 EXPORT_SYMBOL(module_layout);
Josh Boyer c9d9c5a
 #endif
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
+bool secure_modules(void)
Josh Boyer c9d9c5a
+{
Josh Boyer c9d9c5a
+#ifdef CONFIG_MODULE_SIG
Josh Boyer c9d9c5a
+	return (sig_enforce || modules_disabled);
Josh Boyer c9d9c5a
+#else
Josh Boyer c9d9c5a
+	return modules_disabled;
Josh Boyer c9d9c5a
+#endif
Josh Boyer c9d9c5a
+}
Josh Boyer d7ee6f3
+EXPORT_SYMBOL(secure_modules);
Josh Boyer c9d9c5a
-- 
a7fb628
1.9.3
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
7583b10
From 5c9708ebd7a52bf432745dc9b739c54666f2789d Mon Sep 17 00:00:00 2001
Josh Boyer c9d9c5a
From: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer d7ee6f3
Date: Thu, 8 Mar 2012 10:10:38 -0500
Josh Boyer d7ee6f3
Subject: [PATCH 02/14] PCI: Lock down BAR access when module security is
Josh Boyer c9d9c5a
 enabled
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Any hardware that can potentially generate DMA has to be locked down from
Josh Boyer c9d9c5a
userspace in order to avoid it being possible for an attacker to modify
Josh Boyer c9d9c5a
kernel code, allowing them to circumvent disabled module loading or module
Josh Boyer c9d9c5a
signing. Default to paranoid - in future we can potentially relax this for
Josh Boyer c9d9c5a
sufficiently IOMMU-isolated devices.
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer c9d9c5a
---
Josh Boyer c9d9c5a
 drivers/pci/pci-sysfs.c | 10 ++++++++++
Josh Boyer c9d9c5a
 drivers/pci/proc.c      |  8 +++++++-
Josh Boyer c9d9c5a
 drivers/pci/syscall.c   |  3 ++-
Josh Boyer c9d9c5a
 3 files changed, 19 insertions(+), 2 deletions(-)
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
79d682f
index 9ff0a901ecf7..8d0d5d92b8d9 100644
Josh Boyer c9d9c5a
--- a/drivers/pci/pci-sysfs.c
Josh Boyer c9d9c5a
+++ b/drivers/pci/pci-sysfs.c
a7fb628
@@ -30,6 +30,7 @@
Josh Boyer c9d9c5a
 #include <linux/vgaarb.h>
Josh Boyer c9d9c5a
 #include <linux/pm_runtime.h>
a7fb628
 #include <linux/of.h>
Josh Boyer c9d9c5a
+#include <linux/module.h>
Josh Boyer c9d9c5a
 #include "pci.h"
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 static int sysfs_initialized;	/* = 0 */
79d682f
@@ -704,6 +705,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj,
Josh Boyer c9d9c5a
 	loff_t init_off = off;
79d682f
 	u8 *data = (u8 *) buf;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	if (off > dev->cfg_size)
Josh Boyer c9d9c5a
 		return 0;
Josh Boyer c9d9c5a
 	if (off + count > dev->cfg_size) {
79d682f
@@ -998,6 +1002,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
Josh Boyer c9d9c5a
 	resource_size_t start, end;
Josh Boyer c9d9c5a
 	int i;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	for (i = 0; i < PCI_ROM_RESOURCE; i++)
Josh Boyer c9d9c5a
 		if (res == &pdev->resource[i])
Josh Boyer c9d9c5a
 			break;
79d682f
@@ -1099,6 +1106,9 @@ static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj,
79d682f
 				     struct bin_attribute *attr, char *buf,
79d682f
 				     loff_t off, size_t count)
Josh Boyer c9d9c5a
 {
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	return pci_resource_io(filp, kobj, attr, buf, off, count, true);
Josh Boyer c9d9c5a
 }
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
79d682f
index 3f155e78513f..4265ea07e3b0 100644
Josh Boyer c9d9c5a
--- a/drivers/pci/proc.c
Josh Boyer c9d9c5a
+++ b/drivers/pci/proc.c
79d682f
@@ -116,6 +116,9 @@ static ssize_t proc_bus_pci_write(struct file *file, const char __user *buf,
Josh Boyer c9d9c5a
 	int size = dev->cfg_size;
Josh Boyer c9d9c5a
 	int cnt;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	if (pos >= size)
Josh Boyer c9d9c5a
 		return 0;
Josh Boyer c9d9c5a
 	if (nbytes >= size)
79d682f
@@ -195,6 +198,9 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
Josh Boyer c9d9c5a
 #endif /* HAVE_PCI_MMAP */
Josh Boyer c9d9c5a
 	int ret = 0;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	switch (cmd) {
Josh Boyer c9d9c5a
 	case PCIIOC_CONTROLLER:
Josh Boyer c9d9c5a
 		ret = pci_domain_nr(dev->bus);
79d682f
@@ -233,7 +239,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
Josh Boyer c9d9c5a
 	struct pci_filp_private *fpriv = file->private_data;
Josh Boyer c9d9c5a
 	int i, ret;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
-	if (!capable(CAP_SYS_RAWIO))
Josh Boyer c9d9c5a
+	if (!capable(CAP_SYS_RAWIO) || secure_modules())
Josh Boyer c9d9c5a
 		return -EPERM;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 	/* Make sure the caller is mapping a real resource for this device */
Josh Boyer c9d9c5a
diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
79d682f
index b91c4da68365..98f5637304d1 100644
Josh Boyer c9d9c5a
--- a/drivers/pci/syscall.c
Josh Boyer c9d9c5a
+++ b/drivers/pci/syscall.c
Josh Boyer c9d9c5a
@@ -10,6 +10,7 @@
Josh Boyer c9d9c5a
 #include <linux/errno.h>
Josh Boyer c9d9c5a
 #include <linux/pci.h>
Josh Boyer c9d9c5a
 #include <linux/syscalls.h>
Josh Boyer c9d9c5a
+#include <linux/module.h>
Josh Boyer c9d9c5a
 #include <asm/uaccess.h>
Josh Boyer c9d9c5a
 #include "pci.h"
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
@@ -92,7 +93,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn,
Josh Boyer c9d9c5a
 	u32 dword;
Josh Boyer c9d9c5a
 	int err = 0;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
-	if (!capable(CAP_SYS_ADMIN))
Josh Boyer c9d9c5a
+	if (!capable(CAP_SYS_ADMIN) || secure_modules())
Josh Boyer c9d9c5a
 		return -EPERM;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 	dev = pci_get_bus_and_slot(bus, dfn);
Josh Boyer c9d9c5a
-- 
a7fb628
1.9.3
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
7583b10
From c5f35519151d28b1a3c3dee5cb67fd67befa7fb6 Mon Sep 17 00:00:00 2001
Josh Boyer c9d9c5a
From: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer d7ee6f3
Date: Thu, 8 Mar 2012 10:35:59 -0500
Josh Boyer d7ee6f3
Subject: [PATCH 03/14] x86: Lock down IO port access when module security is
Josh Boyer c9d9c5a
 enabled
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
IO port access would permit users to gain access to PCI configuration
Josh Boyer c9d9c5a
registers, which in turn (on a lot of hardware) give access to MMIO register
Josh Boyer c9d9c5a
space. This would potentially permit root to trigger arbitrary DMA, so lock
Josh Boyer c9d9c5a
it down by default.
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer c9d9c5a
---
Josh Boyer c9d9c5a
 arch/x86/kernel/ioport.c | 5 +++--
Josh Boyer c9d9c5a
 drivers/char/mem.c       | 4 ++++
Josh Boyer c9d9c5a
 2 files changed, 7 insertions(+), 2 deletions(-)
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
Josh Boyer fbff9ed
index 4ddaf66ea35f..00b440307419 100644
Josh Boyer c9d9c5a
--- a/arch/x86/kernel/ioport.c
Josh Boyer c9d9c5a
+++ b/arch/x86/kernel/ioport.c
Josh Boyer c9d9c5a
@@ -15,6 +15,7 @@
Josh Boyer c9d9c5a
 #include <linux/thread_info.h>
Josh Boyer c9d9c5a
 #include <linux/syscalls.h>
Josh Boyer c9d9c5a
 #include <linux/bitmap.h>
Josh Boyer c9d9c5a
+#include <linux/module.h>
Josh Boyer c9d9c5a
 #include <asm/syscalls.h>
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 /*
Josh Boyer c9d9c5a
@@ -28,7 +29,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 	if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
Josh Boyer c9d9c5a
 		return -EINVAL;
Josh Boyer c9d9c5a
-	if (turn_on && !capable(CAP_SYS_RAWIO))
Josh Boyer c9d9c5a
+	if (turn_on && (!capable(CAP_SYS_RAWIO) || secure_modules()))
Josh Boyer c9d9c5a
 		return -EPERM;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 	/*
Josh Boyer c9d9c5a
@@ -103,7 +104,7 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
Josh Boyer c9d9c5a
 		return -EINVAL;
Josh Boyer c9d9c5a
 	/* Trying to gain more privileges? */
Josh Boyer c9d9c5a
 	if (level > old) {
Josh Boyer c9d9c5a
-		if (!capable(CAP_SYS_RAWIO))
Josh Boyer c9d9c5a
+		if (!capable(CAP_SYS_RAWIO) || secure_modules())
Josh Boyer c9d9c5a
 			return -EPERM;
Josh Boyer c9d9c5a
 	}
Josh Boyer c9d9c5a
 	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
Josh Boyer c9d9c5a
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
Josh Boyer 9ed75fb
index 917403fe10da..cdf839f9defe 100644
Josh Boyer c9d9c5a
--- a/drivers/char/mem.c
Josh Boyer c9d9c5a
+++ b/drivers/char/mem.c
Josh Boyer fbff9ed
@@ -27,6 +27,7 @@
Josh Boyer c9d9c5a
 #include <linux/export.h>
Josh Boyer c9d9c5a
 #include <linux/io.h>
Josh Boyer c9d9c5a
 #include <linux/aio.h>
Josh Boyer c9d9c5a
+#include <linux/module.h>
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 #include <asm/uaccess.h>
Josh Boyer c9d9c5a
 
Josh Boyer 9ed75fb
@@ -568,6 +569,9 @@ static ssize_t write_port(struct file *file, const char __user *buf,
Josh Boyer c9d9c5a
 	unsigned long i = *ppos;
Josh Boyer c9d9c5a
 	const char __user *tmp = buf;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	if (!access_ok(VERIFY_READ, buf, count))
Josh Boyer c9d9c5a
 		return -EFAULT;
Josh Boyer c9d9c5a
 	while (count-- > 0 && i < 65536) {
Josh Boyer c9d9c5a
-- 
a7fb628
1.9.3
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
7583b10
From 24b607adc80fdebbc3497efc4b997a62edc06280 Mon Sep 17 00:00:00 2001
Josh Boyer c9d9c5a
From: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer d7ee6f3
Date: Fri, 9 Mar 2012 08:39:37 -0500
Josh Boyer d7ee6f3
Subject: [PATCH 04/14] ACPI: Limit access to custom_method
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
custom_method effectively allows arbitrary access to system memory, making
Josh Boyer c9d9c5a
it possible for an attacker to circumvent restrictions on module loading.
Josh Boyer c9d9c5a
Disable it if any such restrictions have been enabled.
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer c9d9c5a
---
Josh Boyer d7ee6f3
 drivers/acpi/custom_method.c | 3 +++
Josh Boyer d7ee6f3
 1 file changed, 3 insertions(+)
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
Josh Boyer fbff9ed
index c68e72414a67..4277938af700 100644
Josh Boyer c9d9c5a
--- a/drivers/acpi/custom_method.c
Josh Boyer c9d9c5a
+++ b/drivers/acpi/custom_method.c
Josh Boyer d7ee6f3
@@ -29,6 +29,9 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
Josh Boyer c9d9c5a
 	struct acpi_table_header table;
Josh Boyer c9d9c5a
 	acpi_status status;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	if (!(*ppos)) {
Josh Boyer c9d9c5a
 		/* parse the table header to get the table length */
Josh Boyer c9d9c5a
 		if (count <= sizeof(struct acpi_table_header))
Josh Boyer c9d9c5a
-- 
a7fb628
1.9.3
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
7583b10
From 215559c7708671e85ceb42f6e25445b9b27f6c38 Mon Sep 17 00:00:00 2001
Josh Boyer c9d9c5a
From: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer d7ee6f3
Date: Fri, 9 Mar 2012 08:46:50 -0500
Josh Boyer d7ee6f3
Subject: [PATCH 05/14] asus-wmi: Restrict debugfs interface when module
Josh Boyer c9d9c5a
 loading is restricted
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
We have no way of validating what all of the Asus WMI methods do on a
Josh Boyer c9d9c5a
given machine, and there's a risk that some will allow hardware state to
Josh Boyer c9d9c5a
be manipulated in such a way that arbitrary code can be executed in the
Josh Boyer c9d9c5a
kernel, circumventing module loading restrictions. Prevent that if any of
Josh Boyer c9d9c5a
these features are enabled.
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer c9d9c5a
---
Josh Boyer c9d9c5a
 drivers/platform/x86/asus-wmi.c | 9 +++++++++
Josh Boyer c9d9c5a
 1 file changed, 9 insertions(+)
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
79d682f
index 3c6ccedc82b6..960c46536c65 100644
Josh Boyer c9d9c5a
--- a/drivers/platform/x86/asus-wmi.c
Josh Boyer c9d9c5a
+++ b/drivers/platform/x86/asus-wmi.c
79d682f
@@ -1592,6 +1592,9 @@ static int show_dsts(struct seq_file *m, void *data)
Josh Boyer c9d9c5a
 	int err;
Josh Boyer c9d9c5a
 	u32 retval = -1;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 	if (err < 0)
79d682f
@@ -1608,6 +1611,9 @@ static int show_devs(struct seq_file *m, void *data)
Josh Boyer c9d9c5a
 	int err;
Josh Boyer c9d9c5a
 	u32 retval = -1;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
Josh Boyer c9d9c5a
 				    &retval);
Josh Boyer c9d9c5a
 
79d682f
@@ -1632,6 +1638,9 @@ static int show_call(struct seq_file *m, void *data)
Josh Boyer c9d9c5a
 	union acpi_object *obj;
Josh Boyer c9d9c5a
 	acpi_status status;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
Josh Boyer c9d9c5a
 				     1, asus->debug.method_id,
Josh Boyer c9d9c5a
 				     &input, &output);
Josh Boyer c9d9c5a
-- 
a7fb628
1.9.3
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
7583b10
From b709a5110b728b526063c6814413a8c0f0d01203 Mon Sep 17 00:00:00 2001
Josh Boyer c9d9c5a
From: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer d7ee6f3
Date: Fri, 9 Mar 2012 09:28:15 -0500
Josh Boyer d7ee6f3
Subject: [PATCH 06/14] Restrict /dev/mem and /dev/kmem when module loading is
Josh Boyer c9d9c5a
 restricted
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Allowing users to write to address space makes it possible for the kernel
Josh Boyer c9d9c5a
to be subverted, avoiding module loading restrictions. Prevent this when
Josh Boyer c9d9c5a
any restrictions have been imposed on loading modules.
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer c9d9c5a
---
Josh Boyer c9d9c5a
 drivers/char/mem.c | 6 ++++++
Josh Boyer c9d9c5a
 1 file changed, 6 insertions(+)
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
Josh Boyer 9ed75fb
index cdf839f9defe..c63cf93b00eb 100644
Josh Boyer c9d9c5a
--- a/drivers/char/mem.c
Josh Boyer c9d9c5a
+++ b/drivers/char/mem.c
Josh Boyer 9ed75fb
@@ -164,6 +164,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
Josh Boyer 9ed75fb
 	if (p != *ppos)
Josh Boyer 9ed75fb
 		return -EFBIG;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	if (!valid_phys_addr_range(p, count))
Josh Boyer c9d9c5a
 		return -EFAULT;
Josh Boyer c9d9c5a
 
Josh Boyer 9ed75fb
@@ -502,6 +505,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
Josh Boyer c9d9c5a
 	char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
Josh Boyer c9d9c5a
 	int err = 0;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	if (p < (unsigned long) high_memory) {
Josh Boyer c9d9c5a
 		unsigned long to_write = min_t(unsigned long, count,
Josh Boyer c9d9c5a
 					       (unsigned long)high_memory - p);
Josh Boyer c9d9c5a
-- 
a7fb628
1.9.3
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
7583b10
From 2896018a1c991e19691ab203a9e9010e898587e7 Mon Sep 17 00:00:00 2001
Josh Boyer c9d9c5a
From: Josh Boyer <jwboyer@redhat.com>
Josh Boyer d7ee6f3
Date: Mon, 25 Jun 2012 19:57:30 -0400
Josh Boyer d7ee6f3
Subject: [PATCH 07/14] acpi: Ignore acpi_rsdp kernel parameter when module
Josh Boyer c9d9c5a
 loading is restricted
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
This option allows userspace to pass the RSDP address to the kernel, which
Josh Boyer c9d9c5a
makes it possible for a user to circumvent any restrictions imposed on
Josh Boyer c9d9c5a
loading modules. Disable it in that case.
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Signed-off-by: Josh Boyer <jwboyer@redhat.com>
Josh Boyer c9d9c5a
---
Josh Boyer c9d9c5a
 drivers/acpi/osl.c | 3 ++-
Josh Boyer c9d9c5a
 1 file changed, 2 insertions(+), 1 deletion(-)
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
7583b10
index bad25b070fe0..0606585e8b93 100644
Josh Boyer c9d9c5a
--- a/drivers/acpi/osl.c
Josh Boyer c9d9c5a
+++ b/drivers/acpi/osl.c
Josh Boyer fbff9ed
@@ -44,6 +44,7 @@
Josh Boyer c9d9c5a
 #include <linux/list.h>
Josh Boyer c9d9c5a
 #include <linux/jiffies.h>
Josh Boyer c9d9c5a
 #include <linux/semaphore.h>
Josh Boyer c9d9c5a
+#include <linux/module.h>
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 #include <asm/io.h>
Josh Boyer c9d9c5a
 #include <asm/uaccess.h>
7583b10
@@ -245,7 +246,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
Josh Boyer c9d9c5a
 acpi_physical_address __init acpi_os_get_root_pointer(void)
Josh Boyer c9d9c5a
 {
Josh Boyer c9d9c5a
 #ifdef CONFIG_KEXEC
Josh Boyer c9d9c5a
-	if (acpi_rsdp)
Josh Boyer c9d9c5a
+	if (acpi_rsdp && !secure_modules())
Josh Boyer c9d9c5a
 		return acpi_rsdp;
Josh Boyer c9d9c5a
 #endif
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
-- 
a7fb628
1.9.3
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
7583b10
From a9c7c2c5e39d3e687b3e90845a753673144a754b Mon Sep 17 00:00:00 2001
Josh Boyer d7ee6f3
From: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer d7ee6f3
Date: Fri, 9 Aug 2013 03:33:56 -0400
Josh Boyer d7ee6f3
Subject: [PATCH 08/14] kexec: Disable at runtime if the kernel enforces module
Josh Boyer d7ee6f3
 loading restrictions
Josh Boyer d7ee6f3
Josh Boyer d7ee6f3
kexec permits the loading and execution of arbitrary code in ring 0, which
Josh Boyer d7ee6f3
is something that module signing enforcement is meant to prevent. It makes
Josh Boyer d7ee6f3
sense to disable kexec in this situation.
Josh Boyer d7ee6f3
Josh Boyer d7ee6f3
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer d7ee6f3
---
Josh Boyer d7ee6f3
 kernel/kexec.c | 8 ++++++++
Josh Boyer d7ee6f3
 1 file changed, 8 insertions(+)
Josh Boyer d7ee6f3
Josh Boyer d7ee6f3
diff --git a/kernel/kexec.c b/kernel/kexec.c
a7fb628
index 6748688813d0..d4d88984bf45 100644
Josh Boyer d7ee6f3
--- a/kernel/kexec.c
Josh Boyer d7ee6f3
+++ b/kernel/kexec.c
Josh Boyer 700baa3
@@ -33,6 +33,7 @@
Josh Boyer d7ee6f3
 #include <linux/swap.h>
Josh Boyer d7ee6f3
 #include <linux/syscore_ops.h>
Josh Boyer 700baa3
 #include <linux/compiler.h>
Josh Boyer d7ee6f3
+#include <linux/module.h>
Josh Boyer d7ee6f3
 
Josh Boyer d7ee6f3
 #include <asm/page.h>
Josh Boyer d7ee6f3
 #include <asm/uaccess.h>
a7fb628
@@ -946,6 +947,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
Josh Boyer d7ee6f3
 		return -EPERM;
Josh Boyer d7ee6f3
 
Josh Boyer d7ee6f3
 	/*
Josh Boyer d7ee6f3
+	 * kexec can be used to circumvent module loading restrictions, so
Josh Boyer d7ee6f3
+	 * prevent loading in that case
Josh Boyer d7ee6f3
+	 */
Josh Boyer d7ee6f3
+	if (secure_modules())
Josh Boyer d7ee6f3
+		return -EPERM;
Josh Boyer d7ee6f3
+
Josh Boyer d7ee6f3
+	/*
Josh Boyer d7ee6f3
 	 * Verify we have a legal set of flags
Josh Boyer d7ee6f3
 	 * This leaves us room for future extensions.
Josh Boyer d7ee6f3
 	 */
Josh Boyer d7ee6f3
-- 
a7fb628
1.9.3
Josh Boyer d7ee6f3
Josh Boyer d7ee6f3
7583b10
From 4ce6023b9f02d5397156976568b3aad88b2f5b95 Mon Sep 17 00:00:00 2001
Josh Boyer c9d9c5a
From: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer d7ee6f3
Date: Fri, 8 Feb 2013 11:12:13 -0800
7583b10
Subject: [PATCH 09/14] x86: Restrict MSR access when module loading is
Josh Boyer c9d9c5a
 restricted
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Writing to MSRs should not be allowed if module loading is restricted,
Josh Boyer c9d9c5a
since it could lead to execution of arbitrary code in kernel mode. Based
Josh Boyer c9d9c5a
on a patch by Kees Cook.
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Cc: Kees Cook <keescook@chromium.org>
Josh Boyer c9d9c5a
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer c9d9c5a
---
Josh Boyer c9d9c5a
 arch/x86/kernel/msr.c | 7 +++++++
Josh Boyer c9d9c5a
 1 file changed, 7 insertions(+)
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
Josh Boyer 700baa3
index c9603ac80de5..8bef43fc3f40 100644
Josh Boyer c9d9c5a
--- a/arch/x86/kernel/msr.c
Josh Boyer c9d9c5a
+++ b/arch/x86/kernel/msr.c
Josh Boyer c9d9c5a
@@ -103,6 +103,9 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
Josh Boyer c9d9c5a
 	int err = 0;
Josh Boyer c9d9c5a
 	ssize_t bytes = 0;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	if (secure_modules())
Josh Boyer c9d9c5a
+		return -EPERM;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	if (count % 8)
Josh Boyer c9d9c5a
 		return -EINVAL;	/* Invalid chunk size */
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
@@ -150,6 +153,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
Josh Boyer c9d9c5a
 			err = -EBADF;
Josh Boyer c9d9c5a
 			break;
Josh Boyer c9d9c5a
 		}
Josh Boyer c9d9c5a
+		if (secure_modules()) {
Josh Boyer c9d9c5a
+			err = -EPERM;
Josh Boyer c9d9c5a
+			break;
Josh Boyer c9d9c5a
+		}
Josh Boyer c9d9c5a
 		if (copy_from_user(&regs, uregs, sizeof regs)) {
Josh Boyer c9d9c5a
 			err = -EFAULT;
Josh Boyer c9d9c5a
 			break;
Josh Boyer c9d9c5a
-- 
a7fb628
1.9.3
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
7583b10
From c95290110f65724e58b7506281759c0bac59b9f5 Mon Sep 17 00:00:00 2001
Josh Boyer c9d9c5a
From: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer d7ee6f3
Date: Fri, 9 Aug 2013 18:36:30 -0400
7583b10
Subject: [PATCH 10/14] Add option to automatically enforce module signatures
Josh Boyer c9d9c5a
 when in Secure Boot mode
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
UEFI Secure Boot provides a mechanism for ensuring that the firmware will
Josh Boyer c9d9c5a
only load signed bootloaders and kernels. Certain use cases may also
Josh Boyer c9d9c5a
require that all kernel modules also be signed. Add a configuration option
Josh Boyer c9d9c5a
that enforces this automatically when enabled.
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Josh Boyer c9d9c5a
---
Josh Boyer d7ee6f3
 Documentation/x86/zero-page.txt       |  2 ++
Josh Boyer d7ee6f3
 arch/x86/Kconfig                      | 10 ++++++++++
Josh Boyer d7ee6f3
 arch/x86/boot/compressed/eboot.c      | 36 +++++++++++++++++++++++++++++++++++
Josh Boyer d7ee6f3
 arch/x86/include/uapi/asm/bootparam.h |  3 ++-
Josh Boyer d7ee6f3
 arch/x86/kernel/setup.c               |  6 ++++++
Josh Boyer d7ee6f3
 include/linux/module.h                |  6 ++++++
Josh Boyer d7ee6f3
 kernel/module.c                       |  7 +++++++
Josh Boyer d7ee6f3
 7 files changed, 69 insertions(+), 1 deletion(-)
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt
Josh Boyer fbff9ed
index 199f453cb4de..ec38acf00b40 100644
Josh Boyer c9d9c5a
--- a/Documentation/x86/zero-page.txt
Josh Boyer c9d9c5a
+++ b/Documentation/x86/zero-page.txt
Josh Boyer c9d9c5a
@@ -30,6 +30,8 @@ Offset	Proto	Name		Meaning
Josh Boyer c9d9c5a
 1E9/001	ALL	eddbuf_entries	Number of entries in eddbuf (below)
Josh Boyer c9d9c5a
 1EA/001	ALL	edd_mbr_sig_buf_entries	Number of entries in edd_mbr_sig_buffer
Josh Boyer c9d9c5a
 				(below)
Josh Boyer c9d9c5a
+1EB/001	ALL     kbd_status      Numlock is enabled
Josh Boyer c9d9c5a
+1EC/001	ALL     secure_boot	Secure boot is enabled in the firmware
Josh Boyer c9d9c5a
 1EF/001	ALL	sentinel	Used to detect broken bootloaders
Josh Boyer c9d9c5a
 290/040	ALL	edd_mbr_sig_buffer EDD MBR signatures
Josh Boyer c9d9c5a
 2D0/A00	ALL	e820_map	E820 memory map table
Josh Boyer c9d9c5a
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
7583b10
index a8f749ef0fdc..35bfd8259993 100644
Josh Boyer c9d9c5a
--- a/arch/x86/Kconfig
Josh Boyer c9d9c5a
+++ b/arch/x86/Kconfig
7583b10
@@ -1556,6 +1556,16 @@ config EFI_MIXED
Josh Boyer c9d9c5a
 
Josh Boyer fbff9ed
 	   If unsure, say N.
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+config EFI_SECURE_BOOT_SIG_ENFORCE
Josh Boyer c9d9c5a
+        def_bool n
Josh Boyer c9d9c5a
+	prompt "Force module signing when UEFI Secure Boot is enabled"
Josh Boyer c9d9c5a
+	---help---
Josh Boyer c9d9c5a
+	  UEFI Secure Boot provides a mechanism for ensuring that the
Josh Boyer c9d9c5a
+	  firmware will only load signed bootloaders and kernels. Certain
Josh Boyer c9d9c5a
+	  use cases may also require that all kernel modules also be signed.
Josh Boyer c9d9c5a
+	  Say Y here to automatically enable module signature enforcement
Josh Boyer c9d9c5a
+	  when a system boots with UEFI Secure Boot enabled.
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 config SECCOMP
Josh Boyer c9d9c5a
 	def_bool y
Josh Boyer c9d9c5a
 	prompt "Enable seccomp to safely compute untrusted bytecode"
Josh Boyer c9d9c5a
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
a7fb628
index 0331d765c2bb..85defaf5a27c 100644
Josh Boyer c9d9c5a
--- a/arch/x86/boot/compressed/eboot.c
Josh Boyer c9d9c5a
+++ b/arch/x86/boot/compressed/eboot.c
Josh Boyer d7ee6f3
@@ -12,6 +12,7 @@
Josh Boyer d7ee6f3
 #include <asm/efi.h>
Josh Boyer d7ee6f3
 #include <asm/setup.h>
Josh Boyer d7ee6f3
 #include <asm/desc.h>
Josh Boyer d7ee6f3
+#include <asm/bootparam_utils.h>
Josh Boyer d7ee6f3
 
Josh Boyer d7ee6f3
 #undef memcpy			/* Use memcpy from misc.c */
Josh Boyer d7ee6f3
 
Josh Boyer fbff9ed
@@ -809,6 +810,37 @@ out:
Josh Boyer fbff9ed
 	return status;
Josh Boyer c9d9c5a
 }
Josh Boyer c9d9c5a
 
Josh Boyer d7ee6f3
+static int get_secure_boot(void)
Josh Boyer c9d9c5a
+{
Josh Boyer c9d9c5a
+	u8 sb, setup;
Josh Boyer c9d9c5a
+	unsigned long datasize = sizeof(sb);
Josh Boyer c9d9c5a
+	efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
Josh Boyer c9d9c5a
+	efi_status_t status;
Josh Boyer c9d9c5a
+
a7fb628
+	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
Josh Boyer c9d9c5a
+				L"SecureBoot", &var_guid, NULL, &datasize, &sb);
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
+	if (status != EFI_SUCCESS)
Josh Boyer c9d9c5a
+		return 0;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
+	if (sb == 0)
Josh Boyer c9d9c5a
+		return 0;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
+
a7fb628
+	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
Josh Boyer c9d9c5a
+				L"SetupMode", &var_guid, NULL, &datasize,
Josh Boyer c9d9c5a
+				&setup);
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
+	if (status != EFI_SUCCESS)
Josh Boyer c9d9c5a
+		return 0;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
+	if (setup == 1)
Josh Boyer c9d9c5a
+		return 0;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
+	return 1;
Josh Boyer c9d9c5a
+}
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 /*
Josh Boyer fbff9ed
  * See if we have Graphics Output Protocol
Josh Boyer fbff9ed
  */
Josh Boyer fbff9ed
@@ -1372,6 +1404,10 @@ struct boot_params *efi_main(struct efi_config *c,
Josh Boyer fbff9ed
 	else
Josh Boyer fbff9ed
 		setup_boot_services32(efi_early);
Josh Boyer c9d9c5a
 
Josh Boyer d7ee6f3
+	sanitize_boot_params(boot_params);
Josh Boyer d7ee6f3
+
Josh Boyer d7ee6f3
+	boot_params->secure_boot = get_secure_boot();
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	setup_graphics(boot_params);
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 	setup_efi_pci(boot_params);
Josh Boyer c9d9c5a
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
Josh Boyer fbff9ed
index 225b0988043a..90dbfb73e11f 100644
Josh Boyer c9d9c5a
--- a/arch/x86/include/uapi/asm/bootparam.h
Josh Boyer c9d9c5a
+++ b/arch/x86/include/uapi/asm/bootparam.h
05892a5
@@ -133,7 +133,8 @@ struct boot_params {
Josh Boyer c9d9c5a
 	__u8  eddbuf_entries;				/* 0x1e9 */
Josh Boyer c9d9c5a
 	__u8  edd_mbr_sig_buf_entries;			/* 0x1ea */
Josh Boyer c9d9c5a
 	__u8  kbd_status;				/* 0x1eb */
Josh Boyer c9d9c5a
-	__u8  _pad5[3];					/* 0x1ec */
Josh Boyer c9d9c5a
+	__u8  secure_boot;				/* 0x1ec */
Josh Boyer d7ee6f3
+	__u8  _pad5[2];					/* 0x1ed */
Josh Boyer c9d9c5a
 	/*
Josh Boyer c9d9c5a
 	 * The sentinel is set to a nonzero value (0xff) in header.S.
Josh Boyer c9d9c5a
 	 *
Josh Boyer c9d9c5a
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
a7fb628
index 78a0e6298922..8ecfec85e527 100644
Josh Boyer c9d9c5a
--- a/arch/x86/kernel/setup.c
Josh Boyer c9d9c5a
+++ b/arch/x86/kernel/setup.c
Josh Boyer 700baa3
@@ -1142,6 +1142,12 @@ void __init setup_arch(char **cmdline_p)
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 	io_delay_init();
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+#ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
Josh Boyer c9d9c5a
+	if (boot_params.secure_boot) {
Josh Boyer c9d9c5a
+		enforce_signed_modules();
Josh Boyer c9d9c5a
+	}
Josh Boyer c9d9c5a
+#endif
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	/*
Josh Boyer c9d9c5a
 	 * Parse the ACPI tables for possible boot-time SMP configuration.
Josh Boyer c9d9c5a
 	 */
Josh Boyer c9d9c5a
diff --git a/include/linux/module.h b/include/linux/module.h
Josh Boyer 700baa3
index fc9b54eb779e..7377bc851461 100644
Josh Boyer c9d9c5a
--- a/include/linux/module.h
Josh Boyer c9d9c5a
+++ b/include/linux/module.h
Josh Boyer 700baa3
@@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add);
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 struct notifier_block;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+#ifdef CONFIG_MODULE_SIG
Josh Boyer c9d9c5a
+extern void enforce_signed_modules(void);
Josh Boyer c9d9c5a
+#else
Josh Boyer c9d9c5a
+static inline void enforce_signed_modules(void) {};
Josh Boyer c9d9c5a
+#endif
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 #ifdef CONFIG_MODULES
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 extern int modules_disabled; /* for sysctl */
Josh Boyer c9d9c5a
diff --git a/kernel/module.c b/kernel/module.c
79d682f
index fc14f48915dd..2d68d276f3b6 100644
Josh Boyer c9d9c5a
--- a/kernel/module.c
Josh Boyer c9d9c5a
+++ b/kernel/module.c
79d682f
@@ -3844,6 +3844,13 @@ void module_layout(struct module *mod,
Josh Boyer c9d9c5a
 EXPORT_SYMBOL(module_layout);
Josh Boyer c9d9c5a
 #endif
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+#ifdef CONFIG_MODULE_SIG
Josh Boyer c9d9c5a
+void enforce_signed_modules(void)
Josh Boyer c9d9c5a
+{
Josh Boyer c9d9c5a
+	sig_enforce = true;
Josh Boyer c9d9c5a
+}
Josh Boyer c9d9c5a
+#endif
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 bool secure_modules(void)
Josh Boyer c9d9c5a
 {
Josh Boyer c9d9c5a
 #ifdef CONFIG_MODULE_SIG
Josh Boyer c9d9c5a
-- 
a7fb628
1.9.3
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
7583b10
From f0baa6f34da3f151c059ca3043945837db0ca8d1 Mon Sep 17 00:00:00 2001
a7fb628
From: Josh Boyer <jwboyer@fedoraproject.org>
Josh Boyer c9d9c5a
Date: Tue, 5 Feb 2013 19:25:05 -0500
7583b10
Subject: [PATCH 11/14] efi: Disable secure boot if shim is in insecure mode
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
A user can manually tell the shim boot loader to disable validation of
Josh Boyer c9d9c5a
images it loads.  When a user does this, it creates a UEFI variable called
Josh Boyer c9d9c5a
MokSBState that does not have the runtime attribute set.  Given that the
Josh Boyer c9d9c5a
user explicitly disabled validation, we can honor that and not enable
Josh Boyer c9d9c5a
secure boot mode if that variable is set.
Josh Boyer c9d9c5a
a7fb628
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
Josh Boyer c9d9c5a
---
Josh Boyer c9d9c5a
 arch/x86/boot/compressed/eboot.c | 20 +++++++++++++++++++-
Josh Boyer c9d9c5a
 1 file changed, 19 insertions(+), 1 deletion(-)
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
a7fb628
index 85defaf5a27c..b4013a4ba005 100644
Josh Boyer c9d9c5a
--- a/arch/x86/boot/compressed/eboot.c
Josh Boyer c9d9c5a
+++ b/arch/x86/boot/compressed/eboot.c
Josh Boyer fbff9ed
@@ -812,8 +812,9 @@ out:
Josh Boyer c9d9c5a
 
Josh Boyer d7ee6f3
 static int get_secure_boot(void)
Josh Boyer c9d9c5a
 {
Josh Boyer c9d9c5a
-	u8 sb, setup;
Josh Boyer c9d9c5a
+	u8 sb, setup, moksbstate;
Josh Boyer c9d9c5a
 	unsigned long datasize = sizeof(sb);
Josh Boyer c9d9c5a
+	u32 attr;
Josh Boyer c9d9c5a
 	efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
Josh Boyer c9d9c5a
 	efi_status_t status;
Josh Boyer c9d9c5a
 
Josh Boyer fbff9ed
@@ -837,6 +838,23 @@ static int get_secure_boot(void)
Josh Boyer c9d9c5a
 	if (setup == 1)
Josh Boyer c9d9c5a
 		return 0;
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
+	/* See if a user has put shim into insecure_mode.  If so, and the variable
Josh Boyer c9d9c5a
+	 * doesn't have the runtime attribute set, we might as well honor that.
Josh Boyer c9d9c5a
+	 */
Josh Boyer c9d9c5a
+	var_guid = EFI_SHIM_LOCK_GUID;
a7fb628
+	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
Josh Boyer c9d9c5a
+				L"MokSBState", &var_guid, &attr, &datasize,
Josh Boyer c9d9c5a
+				&moksbstate);
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
+	/* If it fails, we don't care why.  Default to secure */
Josh Boyer c9d9c5a
+	if (status != EFI_SUCCESS)
Josh Boyer c9d9c5a
+		return 1;
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
+	if (!(attr & EFI_VARIABLE_RUNTIME_ACCESS)) {
Josh Boyer c9d9c5a
+		if (moksbstate == 1)
Josh Boyer c9d9c5a
+			return 0;
Josh Boyer c9d9c5a
+	}
Josh Boyer c9d9c5a
+
Josh Boyer c9d9c5a
 	return 1;
Josh Boyer c9d9c5a
 }
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
-- 
a7fb628
1.9.3
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
7583b10
From 6bc90bfd4c13fd6cc4a536630807406c16395bf5 Mon Sep 17 00:00:00 2001
Josh Boyer c9d9c5a
From: Josh Boyer <jwboyer@fedoraproject.org>
Josh Boyer c9d9c5a
Date: Tue, 27 Aug 2013 13:28:43 -0400
7583b10
Subject: [PATCH 12/14] efi: Make EFI_SECURE_BOOT_SIG_ENFORCE depend on EFI
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
The functionality of the config option is dependent upon the platform being
Josh Boyer c9d9c5a
UEFI based.  Reflect this in the config deps.
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
Josh Boyer c9d9c5a
---
Josh Boyer c9d9c5a
 arch/x86/Kconfig | 3 ++-
Josh Boyer c9d9c5a
 1 file changed, 2 insertions(+), 1 deletion(-)
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
7583b10
index 35bfd8259993..746b1b63da8c 100644
Josh Boyer c9d9c5a
--- a/arch/x86/Kconfig
Josh Boyer c9d9c5a
+++ b/arch/x86/Kconfig
7583b10
@@ -1557,7 +1557,8 @@ config EFI_MIXED
Josh Boyer fbff9ed
 	   If unsure, say N.
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 config EFI_SECURE_BOOT_SIG_ENFORCE
Josh Boyer c9d9c5a
-        def_bool n
Josh Boyer c9d9c5a
+	def_bool n
Josh Boyer c9d9c5a
+	depends on EFI
Josh Boyer c9d9c5a
 	prompt "Force module signing when UEFI Secure Boot is enabled"
Josh Boyer c9d9c5a
 	---help---
Josh Boyer c9d9c5a
 	  UEFI Secure Boot provides a mechanism for ensuring that the
Josh Boyer c9d9c5a
-- 
a7fb628
1.9.3
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
7583b10
From 292f6faa86f44fe261c8da58cc2c7f65aa0acad6 Mon Sep 17 00:00:00 2001
Josh Boyer c9d9c5a
From: Josh Boyer <jwboyer@fedoraproject.org>
Josh Boyer c9d9c5a
Date: Tue, 27 Aug 2013 13:33:03 -0400
7583b10
Subject: [PATCH 13/14] efi: Add EFI_SECURE_BOOT bit
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
UEFI machines can be booted in Secure Boot mode.  Add a EFI_SECURE_BOOT bit
Josh Boyer c9d9c5a
for use with efi_enabled.
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
Josh Boyer c9d9c5a
---
Josh Boyer c9d9c5a
 arch/x86/kernel/setup.c | 2 ++
Josh Boyer c9d9c5a
 include/linux/efi.h     | 1 +
Josh Boyer c9d9c5a
 2 files changed, 3 insertions(+)
Josh Boyer c9d9c5a
Josh Boyer c9d9c5a
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
a7fb628
index 8ecfec85e527..5ce785fc9f05 100644
Josh Boyer c9d9c5a
--- a/arch/x86/kernel/setup.c
Josh Boyer c9d9c5a
+++ b/arch/x86/kernel/setup.c
Josh Boyer 700baa3
@@ -1144,7 +1144,9 @@ void __init setup_arch(char **cmdline_p)
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
Josh Boyer c9d9c5a
 	if (boot_params.secure_boot) {
Josh Boyer fbff9ed
+		set_bit(EFI_SECURE_BOOT, &efi.flags);
Josh Boyer c9d9c5a
 		enforce_signed_modules();
Josh Boyer c9d9c5a
+		pr_info("Secure boot enabled\n");
Josh Boyer c9d9c5a
 	}
Josh Boyer c9d9c5a
 #endif
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
diff --git a/include/linux/efi.h b/include/linux/efi.h
a7fb628
index 41bbf8ba4ba8..e73f391fd3c8 100644
Josh Boyer c9d9c5a
--- a/include/linux/efi.h
Josh Boyer c9d9c5a
+++ b/include/linux/efi.h
a7fb628
@@ -917,6 +917,7 @@ extern int __init efi_setup_pcdp_console(char *);
Josh Boyer c9d9c5a
 #define EFI_MEMMAP		4	/* Can we use EFI memory map? */
Josh Boyer c9d9c5a
 #define EFI_64BIT		5	/* Is the firmware 64-bit? */
05892a5
 #define EFI_ARCH_1		6	/* First arch-specific bit */
05892a5
+#define EFI_SECURE_BOOT		7 /* Are we in Secure Boot mode? */
Josh Boyer c9d9c5a
 
Josh Boyer c9d9c5a
 #ifdef CONFIG_EFI
Josh Boyer fbff9ed
 /*
Josh Boyer c9d9c5a
-- 
a7fb628
1.9.3
Josh Boyer c9d9c5a
7583b10
7583b10
From 594e605ee9589150919aa113e3e01163168ad041 Mon Sep 17 00:00:00 2001
7583b10
From: Josh Boyer <jwboyer@fedoraproject.org>
7583b10
Date: Fri, 20 Jun 2014 08:53:24 -0400
7583b10
Subject: [PATCH 14/14] hibernate: Disable in a signed modules environment
7583b10
7583b10
There is currently no way to verify the resume image when returning
7583b10
from hibernate.  This might compromise the signed modules trust model,
7583b10
so until we can work with signed hibernate images we disable it in
7583b10
a secure modules environment.
7583b10
7583b10
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
7583b10
---
7583b10
 kernel/power/hibernate.c | 3 ++-
7583b10
 1 file changed, 2 insertions(+), 1 deletion(-)
7583b10
7583b10
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
7583b10
index fcc2611d3f14..61711801a9c4 100644
7583b10
--- a/kernel/power/hibernate.c
7583b10
+++ b/kernel/power/hibernate.c
7583b10
@@ -28,6 +28,7 @@
7583b10
 #include <linux/syscore_ops.h>
7583b10
 #include <linux/ctype.h>
7583b10
 #include <linux/genhd.h>
7583b10
+#include <linux/module.h>
7583b10
 #include <trace/events/power.h>
7583b10
 
7583b10
 #include "power.h"
7583b10
@@ -65,7 +66,7 @@ static const struct platform_hibernation_ops *hibernation_ops;
7583b10
 
7583b10
 bool hibernation_available(void)
7583b10
 {
7583b10
-	return (nohibernate == 0);
7583b10
+	return ((nohibernate == 0) && !secure_modules());
7583b10
 }
7583b10
 
7583b10
 /**
7583b10
-- 
7583b10
1.9.3
7583b10