linux-kernel - Re: [PATCH] apparmor: use kvfree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <2a9553a9-47b9-4eb9-ae55-a77bdd14e8c4@canonical.com>
Date: Fri, 10 May 2024 08:36:28 -0700
From: John Johansen <john.johansen@...onical.com>
To: Fedor Pchelkin <pchelkin@...ras.ru>
Cc: Paul Moore <paul@...l-moore.com>, James Morris <jmorris@...ei.org>,
 "Serge E. Hallyn" <serge@...lyn.com>, William Hua
 <william.hua@...onical.com>, apparmor@...ts.ubuntu.com,
 linux-security-module@...r.kernel.org, linux-kernel@...r.kernel.org,
 lvc-project@...uxtesting.org, Alexey Khoroshilov <khoroshilov@...ras.ru>,
 stable@...r.kernel.org
Subject: Re: [PATCH] apparmor: use kvfree_sensitive to free data->data

On 2/1/24 06:24, Fedor Pchelkin wrote:
> Inside unpack_profile() data->data is allocated using kvmemdup() so it
> should be freed with the corresponding kvfree_sensitive().
> 
> Also add missing data->data release for rhashtable insertion failure path
> in unpack_profile().
> 
> Found by Linux Verification Center (linuxtesting.org).
> 
> Fixes: e025be0f26d5 ("apparmor: support querying extended trusted helper extra data")
> Cc: stable@...r.kernel.org
> Signed-off-by: Fedor Pchelkin <pchelkin@...ras.ru>

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

I have pulled this into my tree

> ---
>   security/apparmor/policy.c        | 2 +-
>   security/apparmor/policy_unpack.c | 1 +
>   2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
> index 957654d253dd..14df15e35695 100644
> --- a/security/apparmor/policy.c
> +++ b/security/apparmor/policy.c
> @@ -225,7 +225,7 @@ static void aa_free_data(void *ptr, void *arg)
>   {
>   	struct aa_data *data = ptr;
>   
> -	kfree_sensitive(data->data);
> +	kvfree_sensitive(data->data, data->size);
>   	kfree_sensitive(data->key);
>   	kfree_sensitive(data);
>   }
> diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
> index 5e578ef0ddff..75452acd0e35 100644
> --- a/security/apparmor/policy_unpack.c
> +++ b/security/apparmor/policy_unpack.c
> @@ -1071,6 +1071,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
>   
>   			if (rhashtable_insert_fast(profile->data, &data->head,
>   						   profile->data->p)) {
> +				kvfree_sensitive(data->data, data->size);
>   				kfree_sensitive(data->key);
>   				kfree_sensitive(data);
>   				info = "failed to insert data to table";