diff options
| author | wzt.wzt@gmail.com <wzt.wzt@gmail.com> | 2010-11-10 16:05:15 +0800 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-11-11 07:36:22 +1100 |
| commit | a26d279ea87e9fef2cf8a44b371e48e6091975a6 (patch) | |
| tree | fe1a1a007c0fc1419e8f8e3e845ad18a377569bc /security | |
| parent | 246c3fb16b08193837a8009ff15ef6908534ba71 (diff) | |
| download | linux-stable-a26d279ea87e9fef2cf8a44b371e48e6091975a6.tar.gz linux-stable-a26d279ea87e9fef2cf8a44b371e48e6091975a6.tar.bz2 linux-stable-a26d279ea87e9fef2cf8a44b371e48e6091975a6.zip | |
APPARMOR: Fix memory leak of apparmor_init()
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>
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/lsm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index cf1de4462ccd..b7106f192b75 100644 --- a/security/apparmor/lsm.c +++ b/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 @@ alloc_out: apparmor_enabled = 0; return error; - } security_initcall(apparmor_init); |