52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From f5d664ebeb09d837a0551f6df0c8f038937a1b67 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Fri, 12 May 2023 11:23:11 +0200
|
|
Subject: [PATCH] libsepol: dump non-mls validatetrans rules as such
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The functions constraint_expr_to_str() prepare a string representation
|
|
for validatetrans and mlsvalidatetrans rules. To decide what keyword to
|
|
use the type of expression is consulted. Currently the extra target
|
|
type (CEXPR_XTARGET) is considered to be an MLS statement while its not,
|
|
e.g.:
|
|
|
|
validatetrans CLASS1 t3 == ATTR1;
|
|
|
|
Actually check for MLS expression types only.
|
|
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
Acked-by: James Carter <jwcart2@gmail.com>
|
|
---
|
|
libsepol/src/kernel_to_cil.c | 2 +-
|
|
libsepol/src/kernel_to_conf.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libsepol/src/kernel_to_cil.c b/libsepol/src/kernel_to_cil.c
|
|
index e9cd89c299..7e279e3ff5 100644
|
|
--- a/libsepol/src/kernel_to_cil.c
|
|
+++ b/libsepol/src/kernel_to_cil.c
|
|
@@ -172,7 +172,7 @@ static char *constraint_expr_to_str(struct policydb *pdb, struct constraint_expr
|
|
goto exit;
|
|
}
|
|
|
|
- if (curr->attr >= CEXPR_XTARGET) {
|
|
+ if (curr->attr >= CEXPR_L1L2) {
|
|
*use_mls = 1;
|
|
}
|
|
|
|
diff --git a/libsepol/src/kernel_to_conf.c b/libsepol/src/kernel_to_conf.c
|
|
index c48a71147a..4c93cc10c3 100644
|
|
--- a/libsepol/src/kernel_to_conf.c
|
|
+++ b/libsepol/src/kernel_to_conf.c
|
|
@@ -169,7 +169,7 @@ static char *constraint_expr_to_str(struct policydb *pdb, struct constraint_expr
|
|
goto exit;
|
|
}
|
|
|
|
- if (curr->attr >= CEXPR_XTARGET) {
|
|
+ if (curr->attr >= CEXPR_L1L2) {
|
|
*use_mls = 1;
|
|
}
|
|
|