From: James Carter <jwcart2@gmail.com>
To: selinux@vger.kernel.org
Cc: James Carter <jwcart2@gmail.com>
Subject: [PATCH v2 3/3] libsepol: Improve writing CIL category rules
Date: Fri, 22 May 2020 10:55:13 -0400 [thread overview]
Message-ID: <20200522145513.194440-3-jwcart2@gmail.com> (raw)
In-Reply-To: <20200522145513.194440-1-jwcart2@gmail.com>
Improves writing of CIL category rules when converting MLS kernel
policy to CIL. No changes to functionality, but eliminate useless
checks for category aliases when using the p_cat_val_to_name array,
find the actual number of aliases before allocating memory, and
skip the category alias rules if there are no aliases.
Signed-off-by: James Carter <jwcart2@gmail.com>
---
v2: Add "__attribute__((unused))" to unused parameters as suggested by
Nicolas Iooss
libsepol/src/kernel_to_cil.c | 59 ++++++++++++++++++------------------
1 file changed, 29 insertions(+), 30 deletions(-)
diff --git a/libsepol/src/kernel_to_cil.c b/libsepol/src/kernel_to_cil.c
index b84da3e5..36c6c682 100644
--- a/libsepol/src/kernel_to_cil.c
+++ b/libsepol/src/kernel_to_cil.c
@@ -886,6 +886,17 @@ exit:
return rc;
}
+static int map_count_category_aliases(__attribute__((unused)) char *key, void *data, void *args)
+{
+ cat_datum_t *cat = data;
+ unsigned *count = args;
+
+ if (cat->isalias)
+ (*count)++;
+
+ return SEPOL_OK;
+}
+
static int map_category_aliases_to_strs(char *key, void *data, void *args)
{
cat_datum_t *cat = data;
@@ -903,26 +914,13 @@ static int write_category_rules_to_cil(FILE *out, struct policydb *pdb)
{
cat_datum_t *cat;
char *prev, *name, *actual;
- struct strs *strs;
- unsigned i, num;
+ struct strs *strs = NULL;
+ unsigned i, num = 0;
int rc = 0;
- rc = strs_init(&strs, pdb->p_levels.nprim);
- if (rc != 0) {
- goto exit;
- }
-
/* categories */
for (i=0; i < pdb->p_cats.nprim; i++) {
name = pdb->p_cat_val_to_name[i];
- if (!name) continue;
- cat = hashtab_search(pdb->p_cats.table, name);
- if (!cat) {
- rc = -1;
- goto exit;
- }
- if (cat->isalias) continue;
-
sepol_printf(out, "(category %s)\n", name);
}
@@ -931,14 +929,6 @@ static int write_category_rules_to_cil(FILE *out, struct policydb *pdb)
prev = NULL;
for (i=0; i < pdb->p_cats.nprim; i++) {
name = pdb->p_cat_val_to_name[i];
- if (!name) continue;
- cat = hashtab_search(pdb->p_cats.table, name);
- if (!cat) {
- rc = -1;
- goto exit;
- }
- if (cat->isalias) continue;
-
if (prev) {
sepol_printf(out, "%s ", prev);
}
@@ -949,6 +939,22 @@ static int write_category_rules_to_cil(FILE *out, struct policydb *pdb)
}
sepol_printf(out, "))\n");
+ rc = hashtab_map(pdb->p_cats.table, map_count_category_aliases, &num);
+ if (rc != 0) {
+ goto exit;
+ }
+
+ if (num == 0) {
+ /* No aliases, so skip category alias rules */
+ rc = 0;
+ goto exit;
+ }
+
+ rc = strs_init(&strs, num);
+ if (rc != 0) {
+ goto exit;
+ }
+
rc = hashtab_map(pdb->p_cats.table, map_category_aliases_to_strs, strs);
if (rc != 0) {
goto exit;
@@ -956,16 +962,9 @@ static int write_category_rules_to_cil(FILE *out, struct policydb *pdb)
strs_sort(strs);
- num = strs_num_items(strs);
-
/* category aliases */
for (i=0; i < num; i++) {
name = strs_read_at_index(strs, i);
- cat = hashtab_search(pdb->p_cats.table, name);
- if (!cat) {
- rc = -1;
- goto exit;
- }
sepol_printf(out, "(categoryalias %s)\n", name);
}
--
2.25.4
next prev parent reply other threads:[~2020-05-22 14:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 14:55 [PATCH v2 1/3] libsepol: Write CIL default MLS rules on separate lines James Carter
2020-05-22 14:55 ` [PATCH v2 2/3] libsepol: Improve writing CIL sensitivity rules James Carter
2020-05-22 14:55 ` James Carter [this message]
2020-05-27 16:44 ` [PATCH v2 3/3] libsepol: Improve writing CIL category rules Stephen Smalley
2020-05-27 17:20 ` James Carter
2020-05-27 19:23 ` Stephen Smalley
2020-05-29 12:58 ` Stephen Smalley
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=20200522145513.194440-3-jwcart2@gmail.com \
--to=jwcart2@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).