summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanila Chernetsov <listdansp@mail.ru>2023-04-04 22:05:49 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-07-19 17:36:49 +0300
commit543731db0173252a835b9b43ca4c7c1203a1f41e (patch)
treeb138f39d4e789cc3f831fe493dfef368868d5ec1
parente9e33faea104381bac80ac79328f0540fc2969f2 (diff)
downloadlinux-543731db0173252a835b9b43ca4c7c1203a1f41e.tar.xz
apparmor: fix missing error check for rhashtable_insert_fast
[ Upstream commit 000518bc5aef25d3f703592a0296d578c98b1517 ] rhashtable_insert_fast() could return err value when memory allocation is failed. but unpack_profile() do not check values and this always returns success value. This patch just adds error check code. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: e025be0f26d5 ("apparmor: support querying extended trusted helper extra data") Signed-off-by: Danila Chernetsov <listdansp@mail.ru> Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--security/apparmor/policy_unpack.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index 278ed96c30a2..72aac376d3ed 100644
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -1064,8 +1064,13 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
goto fail;
}
- rhashtable_insert_fast(profile->data, &data->head,
- profile->data->p);
+ if (rhashtable_insert_fast(profile->data, &data->head,
+ profile->data->p)) {
+ kfree_sensitive(data->key);
+ kfree_sensitive(data);
+ info = "failed to insert data to table";
+ goto fail;
+ }
}
if (!aa_unpack_nameX(e, AA_STRUCTEND, NULL)) {