@@ -1063,24 +1063,53 @@ exit:
return rc;
}
+static int __cil_type_rule_to_avtab_helper(policydb_t *pdb,
+ type_datum_t *sepol_src,
+ type_datum_t *sepol_tgt,
+ struct cil_list *class_list,
+ type_datum_t *sepol_result,
+ struct cil_type_rule *cil_rule,
+ cond_node_t *cond_node,
+ enum cil_flavor cond_flavor)
+{
+ int rc;
+ class_datum_t *sepol_obj = NULL;
+ struct cil_list_item *c;
+
+ cil_list_for_each(c, class_list) {
+ rc = __cil_get_sepol_class_datum(pdb, DATUM(c->data), &sepol_obj);
+ if (rc != SEPOL_OK) return rc;
+
+ rc = __cil_insert_type_rule(
+ pdb, cil_rule->rule_kind, sepol_src->s.value,
+ sepol_tgt->s.value, sepol_obj->s.value,
+ sepol_result->s.value, cil_rule, cond_node, cond_flavor
+ );
+ if (rc != SEPOL_OK) return rc;
+ }
+ return SEPOL_OK;
+}
+
static int __cil_type_rule_to_avtab(policydb_t *pdb, const struct cil_db *db, struct cil_type_rule *cil_rule, cond_node_t *cond_node, enum cil_flavor cond_flavor)
{
int rc = SEPOL_ERR;
- uint16_t kind = cil_rule->rule_kind;
+ struct cil_symtab_datum *src = NULL;
+ struct cil_symtab_datum *tgt = NULL;
type_datum_t *sepol_src = NULL;
type_datum_t *sepol_tgt = NULL;
- class_datum_t *sepol_obj = NULL;
struct cil_list *class_list = NULL;
type_datum_t *sepol_result = NULL;
ebitmap_t src_bitmap, tgt_bitmap;
ebitmap_node_t *node1, *node2;
unsigned int i, j;
- struct cil_list_item *c;
- rc = __cil_expand_type(cil_rule->src, &src_bitmap);
- if (rc != SEPOL_OK) goto exit;
+ ebitmap_init(&src_bitmap);
+ ebitmap_init(&tgt_bitmap);
+
+ src = cil_rule->src;
+ tgt = cil_rule->tgt;
- rc = __cil_expand_type(cil_rule->tgt, &tgt_bitmap);
+ rc = __cil_expand_type(src, &src_bitmap);
if (rc != SEPOL_OK) goto exit;
class_list = cil_expand_class(cil_rule->obj);
@@ -1088,19 +1117,34 @@ static int __cil_type_rule_to_avtab(policydb_t *pdb, const struct cil_db *db, st
rc = __cil_get_sepol_type_datum(pdb, DATUM(cil_rule->result), &sepol_result);
if (rc != SEPOL_OK) goto exit;
- ebitmap_for_each_positive_bit(&src_bitmap, node1, i) {
- rc = __cil_get_sepol_type_datum(pdb, DATUM(db->val_to_type[i]), &sepol_src);
+ if (tgt->fqn == CIL_KEY_SELF) {
+ ebitmap_for_each_positive_bit(&src_bitmap, node1, i) {
+ rc = __cil_get_sepol_type_datum(pdb, DATUM(db->val_to_type[i]), &sepol_src);
+ if (rc != SEPOL_OK) goto exit;
+
+ rc = __cil_type_rule_to_avtab_helper(
+ pdb, sepol_src, sepol_src, class_list,
+ sepol_result, cil_rule, cond_node, cond_flavor
+ );
+ if (rc != SEPOL_OK) goto exit;
+ }
+ } else {
+ rc = __cil_expand_type(tgt, &tgt_bitmap);
if (rc != SEPOL_OK) goto exit;
- ebitmap_for_each_positive_bit(&tgt_bitmap, node2, j) {
- rc = __cil_get_sepol_type_datum(pdb, DATUM(db->val_to_type[j]), &sepol_tgt);
+ ebitmap_for_each_positive_bit(&src_bitmap, node1, i) {
+ rc = __cil_get_sepol_type_datum(pdb, DATUM(db->val_to_type[i]), &sepol_src);
if (rc != SEPOL_OK) goto exit;
- cil_list_for_each(c, class_list) {
- rc = __cil_get_sepol_class_datum(pdb, DATUM(c->data), &sepol_obj);
+ ebitmap_for_each_positive_bit(&tgt_bitmap, node2, j) {
+ rc = __cil_get_sepol_type_datum(pdb, DATUM(db->val_to_type[j]), &sepol_tgt);
if (rc != SEPOL_OK) goto exit;
- rc = __cil_insert_type_rule(pdb, kind, sepol_src->s.value, sepol_tgt->s.value, sepol_obj->s.value, sepol_result->s.value, cil_rule, cond_node, cond_flavor);
+ rc = __cil_type_rule_to_avtab_helper(
+ pdb, sepol_src, sepol_tgt, class_list,
+ sepol_result, cil_rule, cond_node,
+ cond_flavor
+ );
if (rc != SEPOL_OK) goto exit;
}
}
@@ -1120,19 +1164,57 @@ int cil_type_rule_to_policydb(policydb_t *pdb, const struct cil_db *db, struct c
return __cil_type_rule_to_avtab(pdb, db, cil_rule, NULL, CIL_FALSE);
}
+static int __cil_typetransition_to_avtab_helper(policydb_t *pdb,
+ type_datum_t *sepol_src,
+ type_datum_t *sepol_tgt,
+ struct cil_list *class_list,
+ char *name,
+ type_datum_t *sepol_result)
+{
+ int rc;
+ class_datum_t *sepol_obj = NULL;
+ uint32_t otype;
+ struct cil_list_item *c;
+
+ cil_list_for_each(c, class_list) {
+ rc = __cil_get_sepol_class_datum(pdb, DATUM(c->data), &sepol_obj);
+ if (rc != SEPOL_OK) return rc;
+
+ rc = policydb_filetrans_insert(
+ pdb, sepol_src->s.value, sepol_tgt->s.value,
+ sepol_obj->s.value, name, NULL,
+ sepol_result->s.value, &otype
+ );
+ if (rc != SEPOL_OK) {
+ if (rc == SEPOL_EEXIST) {
+ if (sepol_result->s.value!= otype) {
+ cil_log(CIL_ERR, "Conflicting name type transition rules\n");
+ } else {
+ rc = SEPOL_OK;
+ }
+ } else {
+ cil_log(CIL_ERR, "Out of memory\n");
+ }
+ if (rc != SEPOL_OK) {
+ return rc;
+ }
+ }
+ }
+ return SEPOL_OK;
+}
+
static int __cil_typetransition_to_avtab(policydb_t *pdb, const struct cil_db *db, struct cil_nametypetransition *typetrans, cond_node_t *cond_node, enum cil_flavor cond_flavor)
{
int rc = SEPOL_ERR;
+ struct cil_symtab_datum *src = NULL;
+ struct cil_symtab_datum *tgt = NULL;
type_datum_t *sepol_src = NULL;
type_datum_t *sepol_tgt = NULL;
- class_datum_t *sepol_obj = NULL;
struct cil_list *class_list = NULL;
type_datum_t *sepol_result = NULL;
ebitmap_t src_bitmap, tgt_bitmap;
ebitmap_node_t *node1, *node2;
unsigned int i, j;
- uint32_t otype;
- struct cil_list_item *c;
char *name = DATUM(typetrans->name)->name;
if (name == CIL_KEY_STAR) {
@@ -1149,10 +1231,13 @@ static int __cil_typetransition_to_avtab(policydb_t *pdb, const struct cil_db *d
return __cil_type_rule_to_avtab(pdb, db, &trans, cond_node, cond_flavor);
}
- rc = __cil_expand_type(typetrans->src, &src_bitmap);
- if (rc != SEPOL_OK) goto exit;
+ ebitmap_init(&src_bitmap);
+ ebitmap_init(&tgt_bitmap);
- rc = __cil_expand_type(typetrans->tgt, &tgt_bitmap);
+ src = typetrans->src;
+ tgt = typetrans->tgt;
+
+ rc = __cil_expand_type(src, &src_bitmap);
if (rc != SEPOL_OK) goto exit;
class_list = cil_expand_class(typetrans->obj);
@@ -1160,37 +1245,34 @@ static int __cil_typetransition_to_avtab(policydb_t *pdb, const struct cil_db *d
rc = __cil_get_sepol_type_datum(pdb, DATUM(typetrans->result), &sepol_result);
if (rc != SEPOL_OK) goto exit;
- ebitmap_for_each_positive_bit(&src_bitmap, node1, i) {
- rc = __cil_get_sepol_type_datum(pdb, DATUM(db->val_to_type[i]), &sepol_src);
+ if (tgt->fqn == CIL_KEY_SELF) {
+ ebitmap_for_each_positive_bit(&src_bitmap, node1, i) {
+ rc = __cil_get_sepol_type_datum(pdb, DATUM(db->val_to_type[i]), &sepol_src);
+ if (rc != SEPOL_OK) goto exit;
+
+ rc = __cil_typetransition_to_avtab_helper(
+ pdb, sepol_src, sepol_src, class_list,
+ name, sepol_result
+ );
+ if (rc != SEPOL_OK) goto exit;
+ }
+ } else {
+ rc = __cil_expand_type(tgt, &tgt_bitmap);
if (rc != SEPOL_OK) goto exit;
- ebitmap_for_each_positive_bit(&tgt_bitmap, node2, j) {
- rc = __cil_get_sepol_type_datum(pdb, DATUM(db->val_to_type[j]), &sepol_tgt);
+ ebitmap_for_each_positive_bit(&src_bitmap, node1, i) {
+ rc = __cil_get_sepol_type_datum(pdb, DATUM(db->val_to_type[i]), &sepol_src);
if (rc != SEPOL_OK) goto exit;
- cil_list_for_each(c, class_list) {
- rc = __cil_get_sepol_class_datum(pdb, DATUM(c->data), &sepol_obj);
+ ebitmap_for_each_positive_bit(&tgt_bitmap, node2, j) {
+ rc = __cil_get_sepol_type_datum(pdb, DATUM(db->val_to_type[j]), &sepol_tgt);
if (rc != SEPOL_OK) goto exit;
- rc = policydb_filetrans_insert(
- pdb, sepol_src->s.value, sepol_tgt->s.value,
- sepol_obj->s.value, name, NULL,
- sepol_result->s.value, &otype
+ rc = __cil_typetransition_to_avtab_helper(
+ pdb, sepol_src, sepol_tgt, class_list,
+ name, sepol_result
);
- if (rc != SEPOL_OK) {
- if (rc == SEPOL_EEXIST) {
- if (sepol_result->s.value!= otype) {
- cil_log(CIL_ERR, "Conflicting name type transition rules\n");
- } else {
- rc = SEPOL_OK;
- }
- } else {
- cil_log(CIL_ERR, "Out of memory\n");
- }
- if (rc != SEPOL_OK) {
- goto exit;
- }
- }
+ if (rc != SEPOL_OK) goto exit;
}
}
}
@@ -373,6 +373,7 @@ exit:
int cil_resolve_type_rule(struct cil_tree_node *current, void *extra_args)
{
+ struct cil_args_resolve *args = extra_args;
struct cil_type_rule *rule = current->data;
struct cil_symtab_datum *src_datum = NULL;
struct cil_symtab_datum *tgt_datum = NULL;
@@ -387,11 +388,15 @@ int cil_resolve_type_rule(struct cil_tree_node *current, void *extra_args)
}
rule->src = src_datum;
- rc = cil_resolve_name(current, rule->tgt_str, CIL_SYM_TYPES, extra_args, &tgt_datum);
- if (rc != SEPOL_OK) {
- goto exit;
+ if (rule->tgt_str == CIL_KEY_SELF) {
+ rule->tgt = args->db->selftype;
+ } else {
+ rc = cil_resolve_name(current, rule->tgt_str, CIL_SYM_TYPES, extra_args, &tgt_datum);
+ if (rc != SEPOL_OK) {
+ goto exit;
+ }
+ rule->tgt = tgt_datum;
}
- rule->tgt = tgt_datum;
rc = cil_resolve_name(current, rule->obj_str, CIL_SYM_CLASSES, extra_args, &obj_datum);
if (rc != SEPOL_OK) {
@@ -638,11 +643,15 @@ int cil_resolve_nametypetransition(struct cil_tree_node *current, void *extra_ar
}
nametypetrans->src = src_datum;
- rc = cil_resolve_name(current, nametypetrans->tgt_str, CIL_SYM_TYPES, extra_args, &tgt_datum);
- if (rc != SEPOL_OK) {
- goto exit;
+ if (nametypetrans->tgt_str == CIL_KEY_SELF) {
+ nametypetrans->tgt = args->db->selftype;
+ } else {
+ rc = cil_resolve_name(current, nametypetrans->tgt_str, CIL_SYM_TYPES, extra_args, &tgt_datum);
+ if (rc != SEPOL_OK) {
+ goto exit;
+ }
+ nametypetrans->tgt = tgt_datum;
}
- nametypetrans->tgt = tgt_datum;
rc = cil_resolve_name(current, nametypetrans->obj_str, CIL_SYM_CLASSES, extra_args, &obj_datum);
if (rc != SEPOL_OK) {
@@ -130,6 +130,9 @@
(typepermissive device_t)
(typemember device_t bin_t file exec_t)
(typetransition device_t console_t files console_device_t)
+ (typetransition device_t exec_type files console_device_t)
+ (typetransition exec_type self files console_device_t)
+ (typetransition exec_type self files "filename" console_device_t)
(roleattribute exec_role)
(roleattribute foo_role)
With the addition of the anon_inode class in the kernel, 'self' transition rules became useful, but haven't been implemented. This patch implements the self keyword in all 'typetransition' statements at the CIL level and adds some basic coverage to the secilc test. Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> --- libsepol/cil/src/cil_binary.c | 168 +++++++++++++++++++++-------- libsepol/cil/src/cil_resolve_ast.c | 25 +++-- secilc/test/policy.cil | 3 + 3 files changed, 145 insertions(+), 51 deletions(-)