---

yaml --- r: 132634 b: refs/heads/master c: 1581e7d h: refs/heads/master v: v3
git-mirror · Feb 22, 2009 · f95a4e1 · f95a4e1
1 parent aa3453a
commit f95a4e1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0da0a420bb542b13ebae142109a9d2045ade0cb1
+refs/heads/master: 1581e7ddbdd97443a134e1a0cc9d81256baf77a4
diff --git a/trunk/security/tomoyo/realpath.c b/trunk/security/tomoyo/realpath.c
@@ -371,10 +371,8 @@ const struct tomoyo_path_info *tomoyo_save_name(const char *name)
 
 /**
  * tomoyo_realpath_init - Initialize realpath related code.
- *
- * Returns 0.
  */
-static int __init tomoyo_realpath_init(void)
+void __init tomoyo_realpath_init(void)
 {
 	int i;
 
@@ -388,11 +386,8 @@ static int __init tomoyo_realpath_init(void)
 	if (tomoyo_find_domain(TOMOYO_ROOT_NAME) != &tomoyo_kernel_domain)
 		panic("Can't register tomoyo_kernel_domain");
 	up_read(&tomoyo_domain_list_lock);
-	return 0;
 }
 
-security_initcall(tomoyo_realpath_init);
-
 /* Memory allocated for temporary purpose. */
 static atomic_t tomoyo_dynamic_memory_size;
 

diff --git a/trunk/security/tomoyo/realpath.h b/trunk/security/tomoyo/realpath.h
@@ -60,4 +60,7 @@ int tomoyo_read_memory_counter(struct tomoyo_io_buffer *head);
 /* Set memory quota. */
 int tomoyo_write_memory_quota(struct tomoyo_io_buffer *head);
 
+/* Initialize realpath related code. */
+void __init tomoyo_realpath_init(void);
+
 #endif /* !defined(_SECURITY_TOMOYO_REALPATH_H) */
diff --git a/trunk/security/tomoyo/tomoyo.c b/trunk/security/tomoyo/tomoyo.c
@@ -287,6 +287,7 @@ static int __init tomoyo_init(void)
 		panic("Failure registering TOMOYO Linux");
 	printk(KERN_INFO "TOMOYO Linux initialized\n");
 	cred->security = &tomoyo_kernel_domain;
+	tomoyo_realpath_init();
 	return 0;
 }