aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2004-10-27 18:16:45 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-27 18:16:45 -0700
commit81fc7a04fb196dbf972736004d93138e628c98ff (patch)
treed2e8b362a66229b4d315f7d6e75ba3973b6bcfcd /security
parentac58b1e675a337f85cf6052a26855b8ded726a7a (diff)
downloadhistory-81fc7a04fb196dbf972736004d93138e628c98ff.tar.gz
[PATCH] move key_init to security_initcall
During system boot many probes, etc. will generate upcalls to userspace via call_usermodehelper(). This has the effect of calling execve() before the key subsystem has been initialized, and thus Oopsing on a NULL key_jar during key_alloc(). Move key_init to security_initcall so that it's called along with other security initialization routines which have similar requirements. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security')
-rw-r--r--security/keys/key.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/key.c b/security/keys/key.c
index da9fc0aea739ea..e527e8f72c26e3 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -1036,4 +1036,4 @@ static int __init key_init(void)
} /* end key_init() */
-subsys_initcall(key_init);
+security_initcall(key_init);