Skip to content

Commit

Permalink
secilc: Fix policy optimization test
Browse files Browse the repository at this point in the history
Commit 692716f ("libsepol/cil: raise default attrs_expand_size to 2") was
reverted and attributes with one type are not expanded anymore.

Fixes:
    ./secilc test/policy.cil
    ./secilc -c 32 -O -M 1 -f /dev/null -o opt-actual.bin test/opt-input.cil
    checkpolicy -b -C -M -o opt-actual.cil opt-actual.bin >/dev/null
    diff test/opt-expected.cil opt-actual.cil
    11a12
    > (typeattribute at01)
    21a23
    > (typeattributeset at01 (tp01))
    25c27,28
    < (allow tp01 self (cl01 (p01a p01b p11a p11b)))
    ---
    > (allow tp01 at01 (cl01 (p11b)))
    > (allow tp01 self (cl01 (p01a p01b p11a)))

Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
Acked-by: James Carter <jwcart2@gmail.com>
  • Loading branch information
bachradsusi committed May 15, 2020
1 parent 63bf6af commit 4159890
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion secilc/test/opt-expected.cil
Expand Up @@ -9,6 +9,7 @@
(category c01)
(categoryorder (c01))
(sensitivitycategory s01 (c01))
(typeattribute at01)
(typeattribute at02)
(boolean b01 false)
(type tp01)
Expand All @@ -19,10 +20,12 @@
(type tpr3)
(type tpr4)
(type tpr5)
(typeattributeset at01 (tp01))
(typeattributeset at02 (tp01 tp02))
(allow at02 tpr1 (cl01 (p01a p01b p11a)))
(allow at02 tpr3 (cl01 (p01a p01b p11a)))
(allow tp01 self (cl01 (p01a p01b p11a p11b)))
(allow tp01 at01 (cl01 (p11b)))
(allow tp01 self (cl01 (p01a p01b p11a)))
(allow tp01 tpr1 (cl01 (p11b)))
(dontaudit at02 tpr2 (cl01 (p01a p01b p11a)))
(dontaudit at02 tpr4 (cl01 (p01a p01b p11a)))
Expand Down

0 comments on commit 4159890

Please sign in to comment.