iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

APPARMOR: Fix memory leak of apparmor_init()

Browse Source 
set_init_cxt() allocted sizeof(struct aa_task_cxt) bytes for cxt,
if register_security() failed, it will cause memory leak.

Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
wzt.wzt@gmail.com 2010-11-10 16:05:15 +08:00 committed by James Morris
parent 246c3fb16b
commit a26d279ea8
1 changed files with 4 additions and 2 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);