libsepol/cil: Output culprit rules from binary policy when CIL AST match fails
PATCH 1/1 libsepol/cil: Output culprit rules from binary policy when CIL AST match fails
Commit d8507429f15c ("secilc: Add program that checks CIL neverallows against a binary policy") added secilcheck to validate neverallows against a binary policy.
When a violation occurs, secilcheck attempts to locate matching allow rules in the CIL AST. However, since the CIL AST in secilcheck only contains neverallow rules and declarations (not allow rules), cil_find_matching_avrule_in_ast() returns an empty set, resulting in no culprit allow rules being printed.
Fall back to calling report_assertion_failures() to output the culprit allow rules from the binary policydb when no matching rules are found in the CIL AST.
--- libsepol/cil/src/cil_binary.c | 16 +++++++++++++--- libsepol/include/sepol/policydb/policydb.h | 2 ++ libsepol/src/assertion.c | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-)
libsepol/cil/src/cil_binary.c +13 -3
@@ -5563,7 +5563,9 @@ static void __cil_print_rule(const char *pad, const char *kind, }static int __cil_print_neverallow_failure (const struct cil_db *db, -struct cil_tree_node *node) +policydb_t *pdb, +struct cil_tree_node *node, +const avrule_t *rule) {int rc;struct cil_list_item *i2;
@@ -5609,6 +5611,12 @@ static int __cil_print_neverallow_failure(const struct cil_db *db,cil_list_for_each (i2, matching) { num_matching++; } +if (num_matching ==0 && pdb !=NULL && rule !=NULL ) { +int res =report_assertion_failures (NULL , pdb, rule); +if (res <0 ) { + rc = res; + } + }cil_list_for_each (i2, matching) { n2 = i2->data; r2 = n2->data;
@@ -5683,7 +5691,8 @@ static int cil_check_neverallow(const struct cil_db *db, policydb_t *pdb, rc =check_assertion (pdb, rule);if (rc ==CIL_TRUE ) { *violation =CIL_TRUE ; - rc =__cil_print_neverallow_failure (db, node); + rc =__cil_print_neverallow_failure (db, pdb, node, + rule);if (rc !=SEPOL_OK ) { goto exit; }
@@ -5708,7 +5717,8 @@ static int cil_check_neverallow(const struct cil_db *db, policydb_t *pdb, rc =check_assertion (pdb, rule);if (rc ==CIL_TRUE ) { *violation =CIL_TRUE ; - rc =__cil_print_neverallow_failure (db, node); + rc =__cil_print_neverallow_failure (db, pdb, + node, rule);if (rc !=SEPOL_OK ) { goto exit; }
libsepol/include/sepol/policydb/policydb.h +2 -0
@@ -714,6 +714,8 @@ extern void cat_datum_destroy(cat_datum_t *x);extern int check_assertion (policydb_t *p,const avrule_t *avrule);extern int check_assertions (sepol_handle_t *handle,policydb_t *p,const avrule_t *avrules); +extern int report_assertion_failures (sepol_handle_t *handle,policydb_t *p, +const avrule_t *narule); extern int symtab_insert(policydb_t *x, uint32_t sym, hashtab_key_t key, hashtab_datum_t datum, uint32_t scope,
libsepol/src/assertion.c +2 -2
@@ -504,8 +504,8 @@ exit:return rc; } -static int report_assertion_failures (sepol_handle_t *handle,policydb_t *p, -const avrule_t *narule) +int report_assertion_failures (sepol_handle_t *handle,policydb_t *p, +const avrule_t *narule) {int rc;struct avtab_match_args args = {
Signature · 1 line
2.55.0.679.g6767b8d81c-goog
Quoted 11 lines · Thiébaud Weksteen
Commit
d8507429f15c("secilc: Add program that checks CIL neverallows against a binary policy") added secilcheck to validate neverallows against a binary policy.When a violation occurs, secilcheck attempts to locate matching allow rules in the CIL AST. However, since the CIL AST in secilcheck only contains neverallow rules and declarations (not allow rules),
cil_find_matching_avrule_in_ast()returns an empty set, resulting in no culprit allow rules being printed.
Quoted 5 lines
Fall back to calling
report_assertion_failures()to output the culprit allow rules from the binary policydb when no matching rules are found in the CIL AST.Signed-off-by Thiébaud Weksteen <[email protected]>
Quoted 85 lines
--- libsepol/cil/src/cil_binary.c | 16 +++++++++++++--- libsepol/include/sepol/policydb/policydb.h | 2 ++ libsepol/src/assertion.c | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-)libsepol/cil/src/cil_binary.c +13
-3@@ -5563,7 +5563,9 @@ static void __cil_print_rule(const char *pad, const char *kind, }static int __cil_print_neverallow_failure (const struct cil_db *db, -struct cil_tree_node *node) +policydb_t *pdb, +struct cil_tree_node *node, +const avrule_t *rule) {int rc;struct cil_list_item *i2;@@ -5609,6 +5611,12 @@ static int __cil_print_neverallow_failure(const struct cil_db *db,cil_list_for_each (i2, matching) { num_matching++; } +if (num_matching ==0 && pdb !=NULL && rule !=NULL ) { +int res =report_assertion_failures (NULL , pdb, rule); +if (res <0 ) { + rc = res; + } + }cil_list_for_each (i2, matching) { n2 = i2->data; r2 = n2->data;@@ -5683,7 +5691,8 @@ static int cil_check_neverallow(const struct cil_db *db, policydb_t *pdb, rc =check_assertion (pdb, rule);if (rc ==CIL_TRUE ) { *violation =CIL_TRUE ; - rc =__cil_print_neverallow_failure (db, node); + rc =__cil_print_neverallow_failure (db, pdb, node, + rule);if (rc !=SEPOL_OK ) { goto exit; }@@ -5708,7 +5717,8 @@ static int cil_check_neverallow(const struct cil_db *db, policydb_t *pdb, rc =check_assertion (pdb, rule);if (rc ==CIL_TRUE ) { *violation =CIL_TRUE ; - rc =__cil_print_neverallow_failure (db, node); + rc =__cil_print_neverallow_failure (db, pdb, + node, rule);if (rc !=SEPOL_OK ) { goto exit; }libsepol/include/sepol/policydb/policydb.h +2
-0@@ -714,6 +714,8 @@ extern void cat_datum_destroy(cat_datum_t *x);extern int check_assertion (policydb_t *p,const avrule_t *avrule);extern int check_assertions (sepol_handle_t *handle,policydb_t *p,const avrule_t *avrules); +extern int report_assertion_failures (sepol_handle_t *handle,policydb_t *p, +const avrule_t *narule); extern int symtab_insert(policydb_t *x, uint32_t sym, hashtab_key_t key, hashtab_datum_t datum, uint32_t scope,libsepol/src/assertion.c +2
-3@@ -504,8 +504,8 @@ exit:return rc; } -static int report_assertion_failures(sepol_handle_t *handle, policydb_t *p, - const avrule_t *narule) +int report_assertion_failures (sepol_handle_t *handle,policydb_t *p, +const avrule_t *narule) {int rc;struct avtab_match_args args = { --2.55.0.679.g6767b8d81c-goog
Stephen Smalley
maintainerQuoted 13 lines · James Carter
Quoted 11 lines · Thiébaud Weksteen
Commit
d8507429f15c("secilc: Add program that checks CIL neverallows against a binary policy") added secilcheck to validate neverallows against a binary policy.When a violation occurs, secilcheck attempts to locate matching allow rules in the CIL AST. However, since the CIL AST in secilcheck only contains neverallow rules and declarations (not allow rules),
cil_find_matching_avrule_in_ast()returns an empty set, resulting in no culprit allow rules being printed.
Quoted 7 lines
Quoted 5 lines
Fall back to calling
report_assertion_failures()to output the culprit allow rules from the binary policydb when no matching rules are found in the CIL AST.Signed-off-by Thiébaud Weksteen <[email protected]>Acked-by James Carter <[email protected]>
Thanks, merged.