SELinux Security Module development
 help / color / mirror / Atom feed
* [PATCH 1/3 v2] libsepol/cil: Remove redundant syntax checking
@ 2021-09-01 20:42 James Carter
  2021-09-01 20:42 ` [PATCH 2/3 v2] libsepol/cil: Use size_t for len in __cil_verify_syntax() James Carter
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: James Carter @ 2021-09-01 20:42 UTC (permalink / raw)
  To: selinux; +Cc: nicolas.iooss, James Carter

For every call to cil_fill_classperms_list(), the syntax of the
whole rule, including the class permissions, has already been
checked. There is no reason to check it again. Also, because the
class permissions appear in the middle of some rules, like
constraints, the syntax array does not end with CIL_SYN_END. This
is the only case where the syntax array does not end with CIL_SYN_END.
This prevents __cil_verify_syntax() from requiring that the syntax
array ends with CIL_SYN_END.

Remove the redundant syntax checking in cil_fill_classperms_list().

Signed-off-by: James Carter <jwcart2@gmail.com>
---
v2: Same as v1

 libsepol/cil/src/cil_build_ast.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/libsepol/cil/src/cil_build_ast.c b/libsepol/cil/src/cil_build_ast.c
index a5afc267..f0bb8c0c 100644
--- a/libsepol/cil/src/cil_build_ast.c
+++ b/libsepol/cil/src/cil_build_ast.c
@@ -736,20 +736,11 @@ int cil_fill_classperms_list(struct cil_tree_node *parse_current, struct cil_lis
 {
 	int rc = SEPOL_ERR;
 	struct cil_tree_node *curr;
-	enum cil_syntax syntax[] = {
-		CIL_SYN_STRING | CIL_SYN_LIST,
-	};
-	int syntax_len = sizeof(syntax)/sizeof(*syntax);
 
 	if (parse_current == NULL || cp_list == NULL) {
 		goto exit;
 	}
 
-	rc = __cil_verify_syntax(parse_current, syntax, syntax_len);
-	if (rc != SEPOL_OK) {
-		goto exit;
-	}
-
 	cil_list_init(cp_list, CIL_CLASSPERMS);
 
 	curr = parse_current->cl_head;
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-09-07 15:33 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-01 20:42 [PATCH 1/3 v2] libsepol/cil: Remove redundant syntax checking James Carter
2021-09-01 20:42 ` [PATCH 2/3 v2] libsepol/cil: Use size_t for len in __cil_verify_syntax() James Carter
2021-09-01 20:42 ` [PATCH 3/3 v2] libsepol/cil: Fix syntax checking " James Carter
2021-09-06 17:53 ` [PATCH 1/3 v2] libsepol/cil: Remove redundant syntax checking Nicolas Iooss
2021-09-07 15:32   ` James Carter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox