checkpolicy does not forward (t1 == t2) constraint correctly
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 1PATCH 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.
---
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
@@ -1745,7 +1745,7 @@ static int constraint_expr_to_string(struct policydb *pdb, struct constraint_expcase 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
PATCH 1/1 libsepol: set correct second argument of (t1 == t2) constraint
In reply to Christian GöttscheCurrently 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.
---
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
@@ -1745,7 +1745,7 @@ static int constraint_expr_to_string(struct policydb *pdb, struct constraint_expcase 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
Re: [PATCH] libsepol: set correct second argument of (t1 == t2) constraint
Quoted 5 lines · Christian Göttsche
Currently a constraint
t1 == t2gets 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")Signed-off-by Christian Göttsche <[email protected]>
Quoted 22 lines
---
Added Signed-off-bylibsepol/src/module_to_cil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)libsepol/src/module_to_cil.c +1
-2@@ -1745,7 +1745,7 @@ static int constraint_expr_to_string(struct policydb *pdb, struct constraint_expcase 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
James Carter
AppliedRe: [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 == t2gets 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")Signed-off-by Christian Göttsche <[email protected]>Acked-by James Carter <[email protected]>
Applied.
Thanks,
Jim
Quoted 22 lines
Quoted 22 lines
---
Added Signed-off-bylibsepol/src/module_to_cil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)libsepol/src/module_to_cil.c +1
-2@@ -1745,7 +1745,7 @@ static int constraint_expr_to_string(struct policydb *pdb, struct constraint_expcase 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