diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-12-09 17:37:16 -0500 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2015-12-15 10:01:43 -0500 |
| commit | 92cc916638a48f285736cd5541536e2e1b73ecf8 (patch) | |
| tree | 95c149a1d3246289a08520a696bd8b12b5a8b6fc /security | |
| parent | 6ad6afa14610c1fed3303c719b1f8f86f19f1fd3 (diff) | |
| download | linux-92cc916638a48f285736cd5541536e2e1b73ecf8.tar.gz linux-92cc916638a48f285736cd5541536e2e1b73ecf8.tar.bz2 linux-92cc916638a48f285736cd5541536e2e1b73ecf8.zip | |
security/integrity: make ima/ima_mok.c explicitly non-modular
The Kconfig currently controlling compilation of this code is:
ima/Kconfig:config IMA_MOK_KEYRING
ima/Kconfig: bool "Create IMA machine owner keys (MOK) and blacklist keyrings"
...meaning that it currently is not being built as a module by anyone.
Lets remove the couple of traces of modularity so that when reading the
driver there is no doubt it really is builtin-only.
Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
Cc: James Morris <james.l.morris@oracle.com>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: linux-ima-devel@lists.sourceforge.net
Cc: linux-ima-user@lists.sourceforge.net
Cc: linux-security-module@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/integrity/ima/ima_mok.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/integrity/ima/ima_mok.c b/security/integrity/ima/ima_mok.c index 8dad9a2b8e47..676885e4320e 100644 --- a/security/integrity/ima/ima_mok.c +++ b/security/integrity/ima/ima_mok.c @@ -16,7 +16,7 @@ #include <linux/sched.h> #include <linux/cred.h> #include <linux/err.h> -#include <linux/module.h> +#include <linux/init.h> #include <keys/asymmetric-type.h> @@ -52,5 +52,4 @@ __init int ima_mok_init(void) set_bit(KEY_FLAG_KEEP, &ima_blacklist_keyring->flags); return 0; } - -module_init(ima_mok_init); +device_initcall(ima_mok_init); |