redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  APPARMOR: Fix memory leak of apparmor_init()
  APPARMOR: Fix memory leak of alloc_namespace()
wifi-calibration
Linus Torvalds 2010-11-12 08:00:25 -08:00
parent 0f90933c47 a26d279ea8
commit fe7e96f66b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/apparmor/lsm.c
View File

@ -922,7 +922,7 @@ static int __init apparmor_init(void)
error = register_security(&apparmor_ops); error = register_security(&apparmor_ops);
if (error) { if (error) {
AA_ERROR("Unable to register AppArmor\n"); AA_ERROR("Unable to register AppArmor\n");
goto register_security_out; goto set_init_cxt_out;
} }
/* Report that AppArmor successfully initialized */ /* Report that AppArmor successfully initialized */
@ -936,6 +936,9 @@ static int __init apparmor_init(void)
return error; return error;
set_init_cxt_out:
aa_free_task_context(current->real_cred->security);
register_security_out: register_security_out:
aa_free_root_ns(); aa_free_root_ns();
@ -944,7 +947,6 @@ alloc_out:
apparmor_enabled = 0; apparmor_enabled = 0;
return error; return error;
} }
security_initcall(apparmor_init); security_initcall(apparmor_init);

2
security/apparmor/policy.c
View File

@ -306,7 +306,7 @@ static struct aa_namespace *alloc_namespace(const char *prefix,
return ns; return ns;
fail_unconfined: fail_unconfined:
kzfree(ns->base.name); kzfree(ns->base.hname);
fail_ns: fail_ns:
kzfree(ns); kzfree(ns);
return NULL; return NULL;