Re: [PATCH] APPARMOR: Fix memory leak of apparmor_init()

[John Johansen <john.johansen@canonical.com>]

On 11/10/2010 12:05 AM, wzt.wzt@gmail.com wrote:
> 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>
> 
yep, thanks again Zhitong

Signed-off-by: John Johansen <john.johansen@canonical.com>

> ---
>  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 cf1de44..b7106f1 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);