From 159d5063d37fae8814e93c140b9d499721c08949 Mon Sep 17 00:00:00 2001 From: Richard Haines Date: Tue, 21 May 2019 12:22:06 +0100 Subject: [PATCH] libsepol/cil: Allow validatetrans rules to be resolved When validatetrans rule is in CIL policy it errors with: u3, r3, and t3 can only be used with mlsvalidatetrans rules Will now resolve these examples: (validatetrans binder (and (and (eq t1 t1_t) (eq t2 t2_t)) (eq t3 t3_t))) (mlsvalidatetrans file (and (and (eq t1 t1_t) (eq t2 t2_t)) (and (eq t3 t3_t) (domby h1 h2)))) Signed-off-by: Richard Haines --- libsepol/cil/src/cil_verify.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libsepol/cil/src/cil_verify.c b/libsepol/cil/src/cil_verify.c index 1036d73c..1a21cf4b 100644 --- a/libsepol/cil/src/cil_verify.c +++ b/libsepol/cil/src/cil_verify.c @@ -221,8 +221,8 @@ int cil_verify_constraint_leaf_expr_syntax(enum cil_flavor l_flavor, enum cil_fl cil_log(CIL_ERR, "l1, l2, h1, and h2 cannot be used on the left side with a string or list on the right side\n"); goto exit; } else if (l_flavor == CIL_CONS_U3 || l_flavor == CIL_CONS_R3 || l_flavor == CIL_CONS_T3) { - if (expr_flavor != CIL_MLSVALIDATETRANS) { - cil_log(CIL_ERR, "u3, r3, and t3 can only be used with mlsvalidatetrans rules\n"); + if (expr_flavor != CIL_VALIDATETRANS && expr_flavor != CIL_MLSVALIDATETRANS) { + cil_log(CIL_ERR, "u3, r3, and t3 can only be used with (mls)validatetrans rules\n"); goto exit; } }