Skip to content

Commit 2bc7350

Browse files
pchelkin91jrjohansen
authored andcommitted
apparmor: use kvfree_sensitive to free data->data
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: e025be0 ("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>
1 parent fce09ea commit 2bc7350

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

security/apparmor/policy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ static void aa_free_data(void *ptr, void *arg)
225225
{
226226
struct aa_data *data = ptr;
227227

228-
kfree_sensitive(data->data);
228+
kvfree_sensitive(data->data, data->size);
229229
kfree_sensitive(data->key);
230230
kfree_sensitive(data);
231231
}

security/apparmor/policy_unpack.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,6 +1071,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
10711071

10721072
if (rhashtable_insert_fast(profile->data, &data->head,
10731073
profile->data->p)) {
1074+
kvfree_sensitive(data->data, data->size);
10741075
kfree_sensitive(data->key);
10751076
kfree_sensitive(data);
10761077
info = "failed to insert data to table";

0 commit comments

Comments
 (0)