Skip to contentSkip to conversation

checkpolicy does not forward (t1 == t2) constraint correctly

PATCH New Christian Göttsche 2 participants 5 messages Mar 17, 2020 – Mar 20, 2020 SELinux security module

lore
Share & tools
lore
#0 lore raw

Hi,

the following cil constraint works correctly:
(constrain (kernel_service (create_files_as)) (eq t1 t2 ))

but the te-style constraint fails at load_policy time:

    constrain kernel_service create_files_as ( t1 == t2 );

with
Invalid syntax
Invalid constraint syntax
Bad expression tree for constraint
Bad constrain declaration at
/var/lib/selinux/debian/tmp/modules/100/base/cil:957

    /usr/sbin/semodule:  Failed!
    make: *** [Rules.modular:59: load] Error 1
#1 lore raw

PATCH 1/1 libsepol: set correct second argument of (t1 == t2) constraint

Currently a constraint t1 == t2 gets converted to the invalid cil syntax (mlsconstrain (class_name (perm_name)) (eq t1 )) and fails to be loaded into the kernel.

Fixes 893851c0a146ef392b8d77de737d52245345129e ("policycoreutils: add a HLL compiler to convert policy packages (.pp) to CIL")

---
Does nobody ever used a constraint with this syntax ever ??

 libsepol/src/module_to_cil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libsepol/src/module_to_cil.c +1 -1
index 6fe7d336..a87bc15e 100644
@@ -1745,7 +1745,7 @@ static int constraint_expr_to_string(struct policydb *pdb, struct constraint_exp
 			case CEXPR_ROLE:                 attr1 = "r1"; attr2 = "r2"; break;
 			case CEXPR_ROLE | CEXPR_TARGET:  attr1 = "r2"; attr2 = "";   break;
 			case CEXPR_ROLE | CEXPR_XTARGET: attr1 = "r3"; attr2 = "";   break;
-			case CEXPR_TYPE:                 attr1 = "t1"; attr2 = "";   break;
+			case CEXPR_TYPE:                 attr1 = "t1"; attr2 = "t2"; break;
 			case CEXPR_TYPE | CEXPR_TARGET:  attr1 = "t2"; attr2 = "";   break;
 			case CEXPR_TYPE | CEXPR_XTARGET: attr1 = "t3"; attr2 = "";   break;
 			case CEXPR_L1L2:                 attr1 = "l1"; attr2 = "l2"; break;
Signature · 1 line
2.26.0.rc2
#2 lore raw

PATCH 1/1 libsepol: set correct second argument of (t1 == t2) constraint

In reply to Christian Göttsche

Currently a constraint t1 == t2 gets converted to the invalid cil syntax (mlsconstrain (class_name (perm_name)) (eq t1 )) and fails to be loaded into the kernel.

Fixes 893851c0a146ef392b8d77de737d52245345129e ("policycoreutils: add a HLL compiler to convert policy packages (.pp) to CIL")

---
Added Signed-off-by

 libsepol/src/module_to_cil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libsepol/src/module_to_cil.c +1 -1
index 6fe7d336..a87bc15e 100644
@@ -1745,7 +1745,7 @@ static int constraint_expr_to_string(struct policydb *pdb, struct constraint_exp
 			case CEXPR_ROLE:                 attr1 = "r1"; attr2 = "r2"; break;
 			case CEXPR_ROLE | CEXPR_TARGET:  attr1 = "r2"; attr2 = "";   break;
 			case CEXPR_ROLE | CEXPR_XTARGET: attr1 = "r3"; attr2 = "";   break;
-			case CEXPR_TYPE:                 attr1 = "t1"; attr2 = "";   break;
+			case CEXPR_TYPE:                 attr1 = "t1"; attr2 = "t2"; break;
 			case CEXPR_TYPE | CEXPR_TARGET:  attr1 = "t2"; attr2 = "";   break;
 			case CEXPR_TYPE | CEXPR_XTARGET: attr1 = "t3"; attr2 = "";   break;
 			case CEXPR_L1L2:                 attr1 = "l1"; attr2 = "l2"; break;
Signature · 1 line
2.26.0.rc2
Acked-by on v1 1/1
#3 lore raw

Re: [PATCH] libsepol: set correct second argument of (t1 == t2) constraint

Quoted 5 lines · Christian Göttsche

Currently a constraint t1 == t2 gets converted to the invalid cil syntax (mlsconstrain (class_name (perm_name)) (eq t1 )) and fails to be loaded into the kernel.

Fixes 893851c0a146ef392b8d77de737d52245345129e ("policycoreutils: add a HLL compiler to convert policy packages (.pp) to CIL")
Quoted 22 lines

---
Added Signed-off-by

 libsepol/src/module_to_cil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libsepol/src/module_to_cil.c +1 -2
index 6fe7d336..a87bc15e 100644
@@ -1745,7 +1745,7 @@ static int constraint_expr_to_string(struct policydb *pdb, struct constraint_exp
                        case CEXPR_ROLE:                 attr1 = "r1"; attr2 = "r2"; break;
                        case CEXPR_ROLE | CEXPR_TARGET:  attr1 = "r2"; attr2 = "";   break;
                        case CEXPR_ROLE | CEXPR_XTARGET: attr1 = "r3"; attr2 = "";   break;
-                       case CEXPR_TYPE:                 attr1 = "t1"; attr2 = "";   break;
+                       case CEXPR_TYPE:                 attr1 = "t1"; attr2 = "t2"; break;
                        case CEXPR_TYPE | CEXPR_TARGET:  attr1 = "t2"; attr2 = "";   break;
                        case CEXPR_TYPE | CEXPR_XTARGET: attr1 = "t3"; attr2 = "";   break;
                        case CEXPR_L1L2:                 attr1 = "l1"; attr2 = "l2"; break;
--

2.26.0.rc2

Applied
#4 lore raw

Re: [PATCH] libsepol: set correct second argument of (t1 == t2) constraint

Quoted 11 lines · James Carter
Quoted 5 lines · Christian Göttsche

Currently a constraint t1 == t2 gets converted to the invalid cil syntax (mlsconstrain (class_name (perm_name)) (eq t1 )) and fails to be loaded into the kernel.

Fixes 893851c0a146ef392b8d77de737d52245345129e ("policycoreutils: add a HLL compiler to convert policy packages (.pp) to CIL")

Applied.

Thanks,
Jim

Quoted 22 lines
Quoted 22 lines

---
Added Signed-off-by

 libsepol/src/module_to_cil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libsepol/src/module_to_cil.c +1 -2
index 6fe7d336..a87bc15e 100644
@@ -1745,7 +1745,7 @@ static int constraint_expr_to_string(struct policydb *pdb, struct constraint_exp
                        case CEXPR_ROLE:                 attr1 = "r1"; attr2 = "r2"; break;
                        case CEXPR_ROLE | CEXPR_TARGET:  attr1 = "r2"; attr2 = "";   break;
                        case CEXPR_ROLE | CEXPR_XTARGET: attr1 = "r3"; attr2 = "";   break;
-                       case CEXPR_TYPE:                 attr1 = "t1"; attr2 = "";   break;
+                       case CEXPR_TYPE:                 attr1 = "t1"; attr2 = "t2"; break;
                        case CEXPR_TYPE | CEXPR_TARGET:  attr1 = "t2"; attr2 = "";   break;
                        case CEXPR_TYPE | CEXPR_XTARGET: attr1 = "t3"; attr2 = "";   break;
                        case CEXPR_L1L2:                 attr1 = "l1"; attr2 = "l2"; break;
--

2.26.0.rc2