SELinux Security Module development
 help / color / mirror / Atom feed
From: James Carter <jwcart2@gmail.com>
To: selinux@vger.kernel.org
Cc: nicolas.iooss@m4x.org, James Carter <jwcart2@gmail.com>
Subject: [PATCH 2/6] libsepol/cil: Destroy the permission nodes when exiting with an error
Date: Thu, 13 May 2021 14:52:50 -0400	[thread overview]
Message-ID: <20210513185254.559588-3-jwcart2@gmail.com> (raw)
In-Reply-To: <20210513185254.559588-1-jwcart2@gmail.com>

When exiting with an error because a class or common has too many
permissions, destroy the permission nodes.

This bug was found by the secilc-fuzzer.

Signed-off-by: James Carter <jwcart2@gmail.com>
---
 libsepol/cil/src/cil_build_ast.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libsepol/cil/src/cil_build_ast.c b/libsepol/cil/src/cil_build_ast.c
index 87043a8f..71f14e20 100644
--- a/libsepol/cil/src/cil_build_ast.c
+++ b/libsepol/cil/src/cil_build_ast.c
@@ -444,6 +444,7 @@ int cil_gen_class(struct cil_db *db, struct cil_tree_node *parse_current, struct
 		}
 		if (class->num_perms > CIL_PERMS_PER_CLASS) {
 			cil_tree_log(parse_current, CIL_ERR, "Too many permissions in class '%s'", class->datum.name);
+			cil_tree_children_destroy(ast_node);
 			rc = SEPOL_ERR;
 			goto exit;
 		}
@@ -1019,6 +1020,7 @@ int cil_gen_common(struct cil_db *db, struct cil_tree_node *parse_current, struc
 	}
 	if (common->num_perms > CIL_PERMS_PER_CLASS) {
 		cil_tree_log(parse_current, CIL_ERR, "Too many permissions in common '%s'", common->datum.name);
+		cil_tree_children_destroy(ast_node);
 		rc = SEPOL_ERR;
 		goto exit;
 	}
-- 
2.26.3


  parent reply	other threads:[~2021-05-13 18:54 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-13 18:52 [PATCH 0/6] More secilc-fuzzer problems fixed James Carter
2021-05-13 18:52 ` [PATCH 1/6] libsepol/cil: Handle disabled optional blocks in earlier passes James Carter
2021-05-13 18:52 ` James Carter [this message]
2021-05-13 18:52 ` [PATCH 3/6] libsepol/cil: Limit the number of open parenthesis allowed James Carter
2021-05-13 18:52 ` [PATCH 4/6] libsepol/cil: Resolve anonymous class permission sets only once James Carter
2021-05-13 18:52 ` [PATCH 5/6] libsepol/cil: Pointers to datums should be set to NULL when resetting James Carter
2021-05-13 18:52 ` [PATCH 6/6] libsepol/cil: Resolve anonymous levels only once James Carter
2021-06-03 17:05 ` [PATCH 0/6] More secilc-fuzzer problems fixed James Carter
2021-06-04 16:58   ` James Carter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210513185254.559588-3-jwcart2@gmail.com \
    --to=jwcart2@gmail.com \
    --cc=nicolas.iooss@m4x.org \
    --cc=selinux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox