Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

apparmor: use kvfree_sensitive to free data->data

Browse Source 
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@vger.kernel.org
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Fedor Pchelkin 2024-02-01 17:24:48 +03:00 committed by John Johansen
parent fce09ea314
commit 2bc73505a5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/apparmor/policy.c
View File

@ -225,7 +225,7 @@ static void aa_free_data(void *ptr, void *arg)
{ {
struct aa_data *data = ptr; struct aa_data *data = ptr;
kfree_sensitive(data->data); kvfree_sensitive(data->data, data->size);
kfree_sensitive(data->key); kfree_sensitive(data->key);
kfree_sensitive(data); kfree_sensitive(data);
} }

1
security/apparmor/policy_unpack.c
View File

@ -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, if (rhashtable_insert_fast(profile->data, &data->head,
profile->data->p)) { profile->data->p)) {
kvfree_sensitive(data->data, data->size);
kfree_sensitive(data->key); kfree_sensitive(data->key);
kfree_sensitive(data); kfree_sensitive(data);
info = "failed to insert data to table"; info = "failed to insert data to table";