This is a note to let you know that I've just added the patch titled
apparmor: add missing failure check in compute_xmatch_perms
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
apparmor-add-missing-failure-check-in-compute_xmatch.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit edee5651c4fdc5f8b959f92822e8cada76d8c389
Author: John Johansen <john.johansen@xxxxxxxxxxxxx>
Date: Fri Apr 14 00:24:47 2023 -0700
apparmor: add missing failure check in compute_xmatch_perms
[ Upstream commit 6600e9f692e36e265ef0828f08337fa294bb330f ]
Add check for failure to allocate the permission table.
Fixes: caa9f579ca72 ("apparmor: isolate policy backwards compatibility to its own file")
Signed-off-by: John Johansen <john.johansen@xxxxxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/security/apparmor/policy_compat.c b/security/apparmor/policy_compat.c
index cc89d1e88fb74..6fa185ce8d9dc 100644
--- a/security/apparmor/policy_compat.c
+++ b/security/apparmor/policy_compat.c
@@ -179,6 +179,8 @@ static struct aa_perms *compute_xmatch_perms(struct aa_dfa *xmatch)
state_count = xmatch->tables[YYTD_ID_BASE]->td_lolen;
/* DFAs are restricted from having a state_count of less than 2 */
perms = kvcalloc(state_count, sizeof(struct aa_perms), GFP_KERNEL);
+ if (!perms)
+ return NULL;
/* zero init so skip the trap state (state == 0) */
for (state = 1; state < state_count; state++)
