diff mbox series

[3/7] libsepol/cil: use ebitmap_init_range

Message ID 20220712160858.22677-3-cgzones@googlemail.com (mailing list archive)
State Accepted
Commit bc8f7b502b4b
Headers show
Series [1/7] libsepol/tests: add ebitmap tests | expand

Commit Message

Christian Göttsche July 12, 2022, 4:08 p.m. UTC 
Especially in the case of __cil_permissionx_expr_range_to_bitmap_helper()
it substitutes hundreds of thousand of calls to ebitmap_set_bit() during
semodule(8) on a policy widely using extended permissions.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
 libsepol/cil/src/cil_post.c | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

Comments

James Carter July 18, 2022, 8:44 p.m. UTC | #1 
On Tue, Jul 12, 2022 at 12:09 PM Christian Göttsche
<cgzones@googlemail.com> wrote:
>
> Especially in the case of __cil_permissionx_expr_range_to_bitmap_helper()
> it substitutes hundreds of thousand of calls to ebitmap_set_bit() during
> semodule(8) on a policy widely using extended permissions.
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>

Acked-by: James Carter <jwcart2@gmail.com>

> ---
>  libsepol/cil/src/cil_post.c | 30 +++++++++---------------------
>  1 file changed, 9 insertions(+), 21 deletions(-)
>
> diff --git a/libsepol/cil/src/cil_post.c b/libsepol/cil/src/cil_post.c
> index 714ce227..6e95225f 100644
> --- a/libsepol/cil/src/cil_post.c
> +++ b/libsepol/cil/src/cil_post.c
> @@ -1191,7 +1191,6 @@ static int __cil_cat_expr_range_to_bitmap_helper(struct cil_list_item *i1, struc
>         struct cil_tree_node *n2 = d2->nodes->head->data;
>         struct cil_cat *c1 = (struct cil_cat *)d1;
>         struct cil_cat *c2 = (struct cil_cat *)d2;
> -       int i;
>
>         if (n1->flavor == CIL_CATSET || n2->flavor == CIL_CATSET) {
>                 cil_log(CIL_ERR, "Category sets cannont be used in a category range\n");
> @@ -1213,12 +1212,10 @@ static int __cil_cat_expr_range_to_bitmap_helper(struct cil_list_item *i1, struc
>                 goto exit;
>         }
>
> -       for (i = c1->value; i <= c2->value; i++) {
> -               if (ebitmap_set_bit(bitmap, i, 1)) {
> -                       cil_log(CIL_ERR, "Failed to set cat bit\n");
> -                       ebitmap_destroy(bitmap);
> -                       goto exit;
> -               }
> +       if (ebitmap_init_range(bitmap, c1->value, c2->value)) {
> +               cil_log(CIL_ERR, "Failed to set cat bit\n");
> +               ebitmap_destroy(bitmap);
> +               goto exit;
>         }
>
>         return SEPOL_OK;
> @@ -1234,7 +1231,6 @@ static int __cil_permissionx_expr_range_to_bitmap_helper(struct cil_list_item *i
>         char *p2 = i2->data;
>         uint16_t v1;
>         uint16_t v2;
> -       uint32_t i;
>
>         rc = __cil_permx_str_to_int(p1, &v1);
>         if (rc != SEPOL_OK) {
> @@ -1246,12 +1242,10 @@ static int __cil_permissionx_expr_range_to_bitmap_helper(struct cil_list_item *i
>                 goto exit;
>         }
>
> -       for (i = v1; i <= v2; i++) {
> -               if (ebitmap_set_bit(bitmap, i, 1)) {
> -                       cil_log(CIL_ERR, "Failed to set permissionx bit\n");
> -                       ebitmap_destroy(bitmap);
> -                       goto exit;
> -               }
> +       if (ebitmap_init_range(bitmap, v1, v2)) {
> +               cil_log(CIL_ERR, "Failed to set permissionx bits\n");
> +               ebitmap_destroy(bitmap);
> +               goto exit;
>         }
>
>         return SEPOL_OK;
> @@ -1318,9 +1312,7 @@ static int __cil_expr_to_bitmap(struct cil_list *expr, ebitmap_t *out, int max,
>                 enum cil_flavor op = (enum cil_flavor)(uintptr_t)curr->data;
>
>                 if (op == CIL_ALL) {
> -                       ebitmap_init(&b1); /* all zeros */
> -                       rc = ebitmap_not(&tmp, &b1, max);
> -                       ebitmap_destroy(&b1);
> +                       rc = ebitmap_init_range(&tmp, 0, max - 1);
>                         if (rc != SEPOL_OK) {
>                                 cil_log(CIL_INFO, "Failed to expand 'all' operator\n");
>                                 ebitmap_destroy(&tmp);
> @@ -1328,19 +1320,15 @@ static int __cil_expr_to_bitmap(struct cil_list *expr, ebitmap_t *out, int max,
>                         }
>                 } else if (op == CIL_RANGE) {
>                         if (flavor == CIL_CAT) {
> -                               ebitmap_init(&tmp);
>                                 rc = __cil_cat_expr_range_to_bitmap_helper(curr->next, curr->next->next, &tmp);
>                                 if (rc != SEPOL_OK) {
>                                         cil_log(CIL_INFO, "Failed to expand category range\n");
> -                                       ebitmap_destroy(&tmp);
>                                         goto exit;
>                                 }
>                         } else if (flavor == CIL_PERMISSIONX) {
> -                               ebitmap_init(&tmp);
>                                 rc = __cil_permissionx_expr_range_to_bitmap_helper(curr->next, curr->next->next, &tmp);
>                                 if (rc != SEPOL_OK) {
>                                         cil_log(CIL_INFO, "Failed to expand category range\n");
> -                                       ebitmap_destroy(&tmp);
>                                         goto exit;
>                                 }
>                         } else {
> --
> 2.36.1
>
diff mbox series

Patch

diff --git a/libsepol/cil/src/cil_post.c b/libsepol/cil/src/cil_post.c
index 714ce227..6e95225f 100644
--- a/libsepol/cil/src/cil_post.c
+++ b/libsepol/cil/src/cil_post.c
@@ -1191,7 +1191,6 @@  static int __cil_cat_expr_range_to_bitmap_helper(struct cil_list_item *i1, struc
 	struct cil_tree_node *n2 = d2->nodes->head->data;
 	struct cil_cat *c1 = (struct cil_cat *)d1;
 	struct cil_cat *c2 = (struct cil_cat *)d2;
-	int i;
 
 	if (n1->flavor == CIL_CATSET || n2->flavor == CIL_CATSET) {
 		cil_log(CIL_ERR, "Category sets cannont be used in a category range\n");
@@ -1213,12 +1212,10 @@  static int __cil_cat_expr_range_to_bitmap_helper(struct cil_list_item *i1, struc
 		goto exit;
 	}
 
-	for (i = c1->value; i <= c2->value; i++) {
-		if (ebitmap_set_bit(bitmap, i, 1)) {
-			cil_log(CIL_ERR, "Failed to set cat bit\n");
-			ebitmap_destroy(bitmap);
-			goto exit;
-		}
+	if (ebitmap_init_range(bitmap, c1->value, c2->value)) {
+		cil_log(CIL_ERR, "Failed to set cat bit\n");
+		ebitmap_destroy(bitmap);
+		goto exit;
 	}
 
 	return SEPOL_OK;
@@ -1234,7 +1231,6 @@  static int __cil_permissionx_expr_range_to_bitmap_helper(struct cil_list_item *i
 	char *p2 = i2->data;
 	uint16_t v1;
 	uint16_t v2;
-	uint32_t i;
 
 	rc = __cil_permx_str_to_int(p1, &v1);
 	if (rc != SEPOL_OK) {
@@ -1246,12 +1242,10 @@  static int __cil_permissionx_expr_range_to_bitmap_helper(struct cil_list_item *i
 		goto exit;
 	}
 
-	for (i = v1; i <= v2; i++) {
-		if (ebitmap_set_bit(bitmap, i, 1)) {
-			cil_log(CIL_ERR, "Failed to set permissionx bit\n");
-			ebitmap_destroy(bitmap);
-			goto exit;
-		}
+	if (ebitmap_init_range(bitmap, v1, v2)) {
+		cil_log(CIL_ERR, "Failed to set permissionx bits\n");
+		ebitmap_destroy(bitmap);
+		goto exit;
 	}
 
 	return SEPOL_OK;
@@ -1318,9 +1312,7 @@  static int __cil_expr_to_bitmap(struct cil_list *expr, ebitmap_t *out, int max,
 		enum cil_flavor op = (enum cil_flavor)(uintptr_t)curr->data;
 
 		if (op == CIL_ALL) {
-			ebitmap_init(&b1); /* all zeros */
-			rc = ebitmap_not(&tmp, &b1, max);
-			ebitmap_destroy(&b1);
+			rc = ebitmap_init_range(&tmp, 0, max - 1);
 			if (rc != SEPOL_OK) {
 				cil_log(CIL_INFO, "Failed to expand 'all' operator\n");
 				ebitmap_destroy(&tmp);
@@ -1328,19 +1320,15 @@  static int __cil_expr_to_bitmap(struct cil_list *expr, ebitmap_t *out, int max,
 			}
 		} else if (op == CIL_RANGE) {
 			if (flavor == CIL_CAT) {
-				ebitmap_init(&tmp);
 				rc = __cil_cat_expr_range_to_bitmap_helper(curr->next, curr->next->next, &tmp);
 				if (rc != SEPOL_OK) {
 					cil_log(CIL_INFO, "Failed to expand category range\n");
-					ebitmap_destroy(&tmp);
 					goto exit;
 				}
 			} else if (flavor == CIL_PERMISSIONX) {
-				ebitmap_init(&tmp);
 				rc = __cil_permissionx_expr_range_to_bitmap_helper(curr->next, curr->next->next, &tmp);
 				if (rc != SEPOL_OK) {
 					cil_log(CIL_INFO, "Failed to expand category range\n");
-					ebitmap_destroy(&tmp);
 					goto exit;
 				}
 			} else {