diff options
| author | Dmitry Kasatkin | 2014-06-27 12:01:32 +0200 |
|---|---|---|
| committer | Mimi Zohar | 2014-09-17 22:10:59 +0200 |
| commit | 31b70f66328e85517b159c786ab31f3fd9a7293c (patch) | |
| tree | 64032d2001ddb216c6234592c8c7af921790c394 /security/integrity/ima/ima_init.c | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li... (diff) | |
| download | kernel-qcow2-linux-31b70f66328e85517b159c786ab31f3fd9a7293c.tar.gz kernel-qcow2-linux-31b70f66328e85517b159c786ab31f3fd9a7293c.tar.xz kernel-qcow2-linux-31b70f66328e85517b159c786ab31f3fd9a7293c.zip | |
ima: move keyring initialization to ima_init()
ima_init() is used as a single place for all initializations.
Experimental keyring patches used the 'late_initcall' which was
co-located with the late_initcall(init_ima). When the late_initcall
for the keyring initialization was abandoned, initialization moved
to init_ima, though it would be more logical to move it to ima_init,
where the rest of the initialization is done. This patch moves the
keyring initialization to ima_init() as a preparatory step for
loading the keys which will be added to ima_init() in following
patches.
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima_init.c')
| -rw-r--r-- | security/integrity/ima/ima_init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c index e8f9d70a465d..8cf0f39c8cd2 100644 --- a/security/integrity/ima/ima_init.c +++ b/security/integrity/ima/ima_init.c @@ -98,6 +98,10 @@ int __init ima_init(void) if (!ima_used_chip) pr_info("No TPM chip found, activating TPM-bypass!\n"); + rc = ima_init_keyring(INTEGRITY_KEYRING_IMA); + if (rc) + return rc; + rc = ima_init_crypto(); if (rc) return rc; |