linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matthew Garrett <matthew.garrett@nebula.com>
To: linux-kernel@vger.kernel.org
Cc: linux-efi@vger.kernel.org, keescook@chromium.org, hpa@zytor.com,
	Matthew Garrett <matthew.garrett@nebula.com>
Subject: [PATCH V3 01/11] Add secure_modules() call
Date: Tue,  3 Sep 2013 19:50:08 -0400	[thread overview]
Message-ID: <1378252218-18798-2-git-send-email-matthew.garrett@nebula.com> (raw)
In-Reply-To: <1378252218-18798-1-git-send-email-matthew.garrett@nebula.com>

Provide a single call to allow kernel code to determine whether the system
has been configured to either disable module loading entirely or to load
only modules signed with a trusted key.

Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
---
 include/linux/module.h |  7 +++++++
 kernel/module.c        | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/include/linux/module.h b/include/linux/module.h
index 46f1ea0..0c266b2 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -509,6 +509,8 @@ int unregister_module_notifier(struct notifier_block * nb);
 
 extern void print_modules(void);
 
+extern bool secure_modules(void);
+
 #else /* !CONFIG_MODULES... */
 
 /* Given an address, look for it in the exception tables. */
@@ -619,6 +621,11 @@ static inline int unregister_module_notifier(struct notifier_block * nb)
 static inline void print_modules(void)
 {
 }
+
+static inline bool secure_modules(void)
+{
+	return false;
+}
 #endif /* CONFIG_MODULES */
 
 #ifdef CONFIG_SYSFS
diff --git a/kernel/module.c b/kernel/module.c
index 2069158..0e94acf 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3852,3 +3852,13 @@ void module_layout(struct module *mod,
 }
 EXPORT_SYMBOL(module_layout);
 #endif
+
+bool secure_modules(void)
+{
+#ifdef CONFIG_MODULE_SIG
+	return (sig_enforce || modules_disabled);
+#else
+	return modules_disabled;
+#endif
+}
+EXPORT_SYMBOL(secure_modules);
-- 
1.8.3.1


  reply	other threads:[~2013-09-03 23:50 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-03 23:50 Matthew Garrett
2013-09-03 23:50 ` Matthew Garrett [this message]
2013-09-04  0:45   ` [PATCH V3 01/11] Add secure_modules() call James Morris
2013-09-05  2:14   ` joeyli
2013-09-03 23:50 ` [PATCH V3 02/11] PCI: Lock down BAR access when module security is enabled Matthew Garrett
2013-09-04  0:45   ` James Morris
2013-09-04 16:57   ` David Woodhouse
2013-09-04 17:04     ` Matthew Garrett
2013-09-04 18:58       ` David Woodhouse
2013-09-04 19:01         ` Matthew Garrett
2013-09-04 19:31           ` David Woodhouse
2013-09-03 23:50 ` [PATCH V3 03/11] x86: Lock down IO port " Matthew Garrett
2013-09-04  0:45   ` James Morris
2013-09-05  3:52   ` H. Peter Anvin
2013-09-05  3:58     ` Matthew Garrett
2013-09-05 15:36       ` H. Peter Anvin
2013-09-03 23:50 ` [PATCH V3 04/11] ACPI: Limit access to custom_method Matthew Garrett
2013-09-04  0:46   ` James Morris
2013-09-03 23:50 ` [PATCH V3 05/11] asus-wmi: Restrict debugfs interface when module loading is restricted Matthew Garrett
2013-09-04  0:46   ` James Morris
2013-09-03 23:50 ` [PATCH V3 06/11] Restrict /dev/mem and /dev/kmem " Matthew Garrett
2013-09-04  0:47   ` James Morris
2013-09-03 23:50 ` [PATCH V3 07/11] acpi: Ignore acpi_rsdp kernel parameter " Matthew Garrett
2013-09-03 23:50 ` [PATCH V3 08/11] kexec: Disable at runtime if the kernel enforces module loading restrictions Matthew Garrett
2013-09-04  0:48   ` James Morris
2013-09-04 20:09   ` jerry.hoemann
2013-09-04 20:12     ` Matthew Garrett
2013-09-04 20:14     ` Josh Boyer
2013-09-08  6:40   ` Greg KH
2013-09-08  6:44     ` Matthew Garrett
2013-09-08  7:24       ` Greg KH
2013-09-08 14:40         ` Matthew Garrett
2013-09-08 15:51         ` Kees Cook
2013-09-08 16:18           ` Greg KH
2013-09-08 16:24             ` Matthew Garrett
2013-09-08 16:39               ` Greg KH
2013-09-08 16:59                 ` Matthew Garrett
2013-09-08 17:22                   ` Greg KH
2013-09-08 17:25                     ` Matthew Garrett
2013-09-08 17:11           ` James Bottomley
2013-09-08 17:15             ` Matthew Garrett
2013-09-08 17:22               ` James Bottomley
2013-09-08 17:27                 ` Matthew Garrett
2013-09-08 17:32                   ` James Bottomley
2013-09-08 17:38                     ` Matthew Garrett
2013-09-03 23:50 ` [PATCH V3 09/11] uswsusp: Disable when module loading is restricted Matthew Garrett
2013-09-04  0:48   ` James Morris
2013-09-05  3:20   ` joeyli
2013-09-03 23:50 ` [PATCH V3 10/11] x86: Restrict MSR access " Matthew Garrett
2013-09-04  0:49   ` James Morris
2013-09-03 23:50 ` [PATCH V3 11/11] Add option to automatically enforce module signatures when in Secure Boot mode Matthew Garrett
2013-09-04  1:42   ` James Morris
2013-09-04  1:42     ` Matthew Garrett
2013-09-05  3:13   ` joeyli
2013-09-05  8:24   ` joeyli
2013-09-05 10:16   ` Matt Fleming
2013-09-05 12:54     ` Matthew Garrett
2013-09-04 15:53 ` Kees Cook
2013-09-04 16:05   ` Re: Josh Boyer

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=1378252218-18798-2-git-send-email-matthew.garrett@nebula.com \
    --to=matthew.garrett@nebula.com \
    --cc=hpa@zytor.com \
    --cc=keescook@chromium.org \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).