Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <3839b02b-36b2-a722-83f9-1e86e66746f2@canonical.com>
Date:   Wed, 22 Jun 2022 12:49:48 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.1
Subject: Re: [PATCH -next] apparmor: Fix memleak in
 aa_simple_write_to_buffer()
Content-Language: en-US
To:     Xiu Jianfeng <xiujianfeng@huawei.com>, jmorris@namei.org,
        serge@hallyn.com
Cc:     apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20220614090001.155107-1-xiujianfeng@huawei.com>
From:   John Johansen <john.johansen@canonical.com>
Organization: Canonical
In-Reply-To: <20220614090001.155107-1-xiujianfeng@huawei.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

Sorry this feel through the cracks some how.

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

I will pull this into my tree and send it up with my next pull request.

On 6/14/22 02:00, Xiu Jianfeng wrote:
> When copy_from_user failed, the memory is freed by kvfree. however the
> management struct and data blob are allocated independently, so only
> kvfree(data) cause a memleak issue here. Use aa_put_loaddata(data) to
> fix this issue.
> 
> Fixes: a6a52579e52b5 ("apparmor: split load data into management struct and data blob")
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
> ---
>  security/apparmor/apparmorfs.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
> index 8b9c92f3ff95..0275a350dc23 100644
> --- a/security/apparmor/apparmorfs.c
> +++ b/security/apparmor/apparmorfs.c
> @@ -403,7 +403,7 @@ static struct aa_loaddata *aa_simple_write_to_buffer(const char __user *userbuf,
>  
>  	data->size = copy_size;
>  	if (copy_from_user(data->data, userbuf, copy_size)) {
> -		kvfree(data);
> +		aa_put_loaddata(data);
>  		return ERR_PTR(-EFAULT);
>  	}
>