]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
ima: move keyring initialization to ima_init()
authorDmitry Kasatkin <d.kasatkin@samsung.com>
Fri, 27 Jun 2014 10:01:32 +0000 (13:01 +0300)
committerMimi Zohar <zohar@linux.vnet.ibm.com>
Wed, 17 Sep 2014 20:10:59 +0000 (16:10 -0400)
commit31b70f66328e85517b159c786ab31f3fd9a7293c
tree64032d2001ddb216c6234592c8c7af921790c394
parentac60ab4b4968b54fb5af20eac9dd78e36ad910c1
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>
security/integrity/ima/ima_init.c
security/integrity/ima/ima_main.c