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: 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>

diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 957654d253dd74cb50ac2a666a1588a03ac2e821..14df15e3569525fb16fd16360b6cfe2a78688c55 100644 (file)
--- 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 5e578ef0ddffb1f7adb0cc9863bcbd18ec9a562b..75452acd0e3523168ba23be2d4b21b7166148bbf 100644 (file)
--- 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";