---

yaml --- r: 221749 b: refs/heads/master c: a26d279 h: refs/heads/master i: 221747: a8cc2ed v: v3
git-mirror · Nov 10, 2010 · d9c80b3 · d9c80b3
1 parent f8b10c0
commit d9c80b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 246c3fb16b08193837a8009ff15ef6908534ba71
+refs/heads/master: a26d279ea87e9fef2cf8a44b371e48e6091975a6
diff --git a/trunk/security/apparmor/lsm.c b/trunk/security/apparmor/lsm.c
@@ -922,7 +922,7 @@ static int __init apparmor_init(void)
 	error = register_security(&apparmor_ops);
 	if (error) {
 		AA_ERROR("Unable to register AppArmor\n");
-		goto register_security_out;
+		goto set_init_cxt_out;
 	}
 
 	/* Report that AppArmor successfully initialized */
@@ -936,6 +936,9 @@ static int __init apparmor_init(void)
 
 	return error;
 
+set_init_cxt_out:
+	aa_free_task_context(current->real_cred->security);
+
 register_security_out:
 	aa_free_root_ns();
 
@@ -944,7 +947,6 @@ static int __init apparmor_init(void)
 
 	apparmor_enabled = 0;
 	return error;
-
 }
 
 security_initcall(apparmor_init);