RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2024-12-25 23:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsepol/cil: Add pointers to datums to improve writing out AST

Browse Source 
There are many rules in CIL that do not declare an object but
reference a datum or relate two or more datums together. In the
struct for these rules, strings are stored so that the appropriate
datums can be looked up when the rule is resolved. One example is
classcommon, which relates a kernel class and a common class. Often
the datums referenced in these rules will not be needed again, so
there are no pointers to datums in the struct for these rules.

When these rules are in a macro and make use of one of the arguments,
then we do not know the actual value to use when writing out the
AST for the resolve phase or later. Re-resolving the strings to
find the corresponding datums would be complex. If the structs for
these rules had pointers to the datums, then we could use the datums
to write out the correct values.

Add pointers to the datums in the data structures for these rules
and then use the actual datum values when writing out the AST.

Signed-off-by: James Carter <jwcart2@gmail.com>
This commit is contained in:
James Carter 2023-09-27 14:25:20 -04:00
parent e9fb71f05d
commit 18657ad1cc
5 changed files with 96 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libsepol/cil/src/cil.c
View File

@ -2275,6 +2275,7 @@ void cil_blockabstract_init(struct cil_blockabstract **abstract)
{ {
*abstract = cil_malloc(sizeof(**abstract)); *abstract = cil_malloc(sizeof(**abstract));
(*abstract)->block_str = NULL; (*abstract)->block_str = NULL;
(*abstract)->block = NULL;
} }
void cil_in_init(struct cil_in **in) void cil_in_init(struct cil_in **in)
@ -2284,6 +2285,7 @@ void cil_in_init(struct cil_in **in)
cil_symtab_array_init((*in)->symtab, cil_sym_sizes[CIL_SYM_ARRAY_IN]); cil_symtab_array_init((*in)->symtab, cil_sym_sizes[CIL_SYM_ARRAY_IN]);
(*in)->is_after = CIL_FALSE; (*in)->is_after = CIL_FALSE;
(*in)->block_str = NULL; (*in)->block_str = NULL;
(*in)->block = NULL;
} }
void cil_class_init(struct cil_class **class) void cil_class_init(struct cil_class **class)
@ -2304,7 +2306,9 @@ void cil_classcommon_init(struct cil_classcommon **classcommon)
*classcommon = cil_malloc(sizeof(**classcommon)); *classcommon = cil_malloc(sizeof(**classcommon));
(*classcommon)->class_str = NULL; (*classcommon)->class_str = NULL;
(*classcommon)->class = NULL;
(*classcommon)->common_str = NULL; (*classcommon)->common_str = NULL;
(*classcommon)->common = NULL;
} }
void cil_sid_init(struct cil_sid **sid) void cil_sid_init(struct cil_sid **sid)
@ -2322,6 +2326,7 @@ void cil_sidcontext_init(struct cil_sidcontext **sidcontext)
*sidcontext = cil_malloc(sizeof(**sidcontext)); *sidcontext = cil_malloc(sizeof(**sidcontext));
(*sidcontext)->sid_str = NULL; (*sidcontext)->sid_str = NULL;
(*sidcontext)->sid = NULL;
(*sidcontext)->context_str = NULL; (*sidcontext)->context_str = NULL;
(*sidcontext)->context = NULL; (*sidcontext)->context = NULL;
} }
@ -2381,6 +2386,7 @@ void cil_roleattributeset_init(struct cil_roleattributeset **attrset)
*attrset = cil_malloc(sizeof(**attrset)); *attrset = cil_malloc(sizeof(**attrset));
(*attrset)->attr_str = NULL; (*attrset)->attr_str = NULL;
(*attrset)->attr = NULL;
(*attrset)->str_expr = NULL; (*attrset)->str_expr = NULL;
(*attrset)->datum_expr = NULL; (*attrset)->datum_expr = NULL;
} }
@ -2402,6 +2408,7 @@ void cil_typeattributeset_init(struct cil_typeattributeset **attrset)
*attrset = cil_malloc(sizeof(**attrset)); *attrset = cil_malloc(sizeof(**attrset));
(*attrset)->attr_str = NULL; (*attrset)->attr_str = NULL;
(*attrset)->attr = NULL;
(*attrset)->str_expr = NULL; (*attrset)->str_expr = NULL;
(*attrset)->datum_expr = NULL; (*attrset)->datum_expr = NULL;
} }
@ -2429,7 +2436,9 @@ void cil_aliasactual_init(struct cil_aliasactual **aliasactual)
*aliasactual = cil_malloc(sizeof(**aliasactual)); *aliasactual = cil_malloc(sizeof(**aliasactual));
(*aliasactual)->alias_str = NULL; (*aliasactual)->alias_str = NULL;
(*aliasactual)->alias = NULL;
(*aliasactual)->actual_str = NULL; (*aliasactual)->actual_str = NULL;
(*aliasactual)->actual = NULL;
} }
void cil_typepermissive_init(struct cil_typepermissive **typeperm) void cil_typepermissive_init(struct cil_typepermissive **typeperm)
@ -2598,6 +2607,7 @@ void cil_senscat_init(struct cil_senscat **senscat)
*senscat = cil_malloc(sizeof(**senscat)); *senscat = cil_malloc(sizeof(**senscat));
(*senscat)->sens_str = NULL; (*senscat)->sens_str = NULL;
(*senscat)->sens = NULL;
(*senscat)->cats = NULL; (*senscat)->cats = NULL;
} }
@ -2768,6 +2778,7 @@ void cil_classpermissionset_init(struct cil_classpermissionset **cps)
*cps = cil_malloc(sizeof(**cps)); *cps = cil_malloc(sizeof(**cps));
(*cps)->set_str = NULL; (*cps)->set_str = NULL;
(*cps)->set = NULL;
(*cps)->classperms = NULL; (*cps)->classperms = NULL;
} }
@ -2792,7 +2803,9 @@ void cil_classmapping_init(struct cil_classmapping **mapping)
*mapping = cil_malloc(sizeof(**mapping)); *mapping = cil_malloc(sizeof(**mapping));
(*mapping)->map_class_str = NULL; (*mapping)->map_class_str = NULL;
(*mapping)->map_class = NULL;
(*mapping)->map_perm_str = NULL; (*mapping)->map_perm_str = NULL;
(*mapping)->map_perm = NULL;
(*mapping)->classperms = NULL; (*mapping)->classperms = NULL;
} }
@ -2823,6 +2836,7 @@ void cil_userattributeset_init(struct cil_userattributeset **attrset)
*attrset = cil_malloc(sizeof(**attrset)); *attrset = cil_malloc(sizeof(**attrset));
(*attrset)->attr_str = NULL; (*attrset)->attr_str = NULL;
(*attrset)->attr = NULL;
(*attrset)->str_expr = NULL; (*attrset)->str_expr = NULL;
(*attrset)->datum_expr = NULL; (*attrset)->datum_expr = NULL;
} }
@ -2832,6 +2846,7 @@ void cil_userlevel_init(struct cil_userlevel **usrlvl)
*usrlvl = cil_malloc(sizeof(**usrlvl)); *usrlvl = cil_malloc(sizeof(**usrlvl));
(*usrlvl)->user_str = NULL; (*usrlvl)->user_str = NULL;
(*usrlvl)->user = NULL;
(*usrlvl)->level_str = NULL; (*usrlvl)->level_str = NULL;
(*usrlvl)->level = NULL; (*usrlvl)->level = NULL;
} }
@ -2841,6 +2856,7 @@ void cil_userrange_init(struct cil_userrange **userrange)
*userrange = cil_malloc(sizeof(**userrange)); *userrange = cil_malloc(sizeof(**userrange));
(*userrange)->user_str = NULL; (*userrange)->user_str = NULL;
(*userrange)->user = NULL;
(*userrange)->range_str = NULL; (*userrange)->range_str = NULL;
(*userrange)->range = NULL; (*userrange)->range = NULL;
} }
@ -2928,7 +2944,9 @@ void cil_bounds_init(struct cil_bounds **bounds)
*bounds = cil_malloc(sizeof(**bounds)); *bounds = cil_malloc(sizeof(**bounds));
(*bounds)->parent_str = NULL; (*bounds)->parent_str = NULL;
(*bounds)->parent = NULL;
(*bounds)->child_str = NULL; (*bounds)->child_str = NULL;
(*bounds)->child = NULL;
} }
void cil_default_init(struct cil_default **def) void cil_default_init(struct cil_default **def)

8
libsepol/cil/src/cil_copy_ast.c
View File

@ -148,6 +148,7 @@ int cil_copy_blockabstract(__attribute__((unused)) struct cil_db *db, void *data
cil_blockabstract_init(&new); cil_blockabstract_init(&new);
new->block_str = orig->block_str; new->block_str = orig->block_str;
new->block = orig->block;
*copy = new; *copy = new;
@ -248,7 +249,9 @@ int cil_copy_classmapping(__attribute__((unused)) struct cil_db *db, void *data,
cil_classmapping_init(&new); cil_classmapping_init(&new);
new->map_class_str = orig->map_class_str; new->map_class_str = orig->map_class_str;
new->map_class = orig->map_class;
new->map_perm_str = orig->map_perm_str; new->map_perm_str = orig->map_perm_str;
new->map_perm = orig->map_perm;
cil_copy_classperms_list(orig->classperms, &new->classperms); cil_copy_classperms_list(orig->classperms, &new->classperms);
@ -311,6 +314,7 @@ int cil_copy_classpermissionset(__attribute__((unused)) struct cil_db *db, void
cil_classpermissionset_init(&new); cil_classpermissionset_init(&new);
new->set_str = orig->set_str; new->set_str = orig->set_str;
new->set = orig->set;
cil_copy_classperms_list(orig->classperms, &new->classperms); cil_copy_classperms_list(orig->classperms, &new->classperms);
@ -327,7 +331,9 @@ int cil_copy_classcommon(__attribute__((unused)) struct cil_db *db, void *data,
cil_classcommon_init(&new); cil_classcommon_init(&new);
new->class_str = orig->class_str; new->class_str = orig->class_str;
new->class = orig->class;
new->common_str = orig->common_str; new->common_str = orig->common_str;
new->common = orig->common;
*copy = new; *copy = new;
@ -679,7 +685,9 @@ static int cil_copy_aliasactual(__attribute__((unused)) struct cil_db *db, void
cil_aliasactual_init(&new); cil_aliasactual_init(&new);
new->alias_str = orig->alias_str; new->alias_str = orig->alias_str;
new->alias = orig->alias;
new->actual_str = orig->actual_str; new->actual_str = orig->actual_str;
new->actual = orig->actual;
*copy = new; *copy = new;

18
libsepol/cil/src/cil_internal.h
View File

@ -367,12 +367,14 @@ struct cil_blockinherit {
struct cil_blockabstract { struct cil_blockabstract {
char *block_str; char *block_str;
struct cil_block *block;
}; };
struct cil_in { struct cil_in {
symtab_t symtab[CIL_SYM_NUM]; symtab_t symtab[CIL_SYM_NUM];
int is_after; int is_after;
char *block_str; char *block_str;
struct cil_block *block;
}; };
struct cil_optional { struct cil_optional {
@ -412,18 +414,23 @@ struct cil_classpermission {
struct cil_classpermissionset { struct cil_classpermissionset {
char *set_str; char *set_str;
struct cil_classpermission *set;
struct cil_list *classperms; struct cil_list *classperms;
}; };
struct cil_classmapping { struct cil_classmapping {
char *map_class_str; char *map_class_str;
struct cil_class *map_class;
char *map_perm_str; char *map_perm_str;
struct cil_perm *map_perm;
struct cil_list *classperms; struct cil_list *classperms;
}; };
struct cil_classcommon { struct cil_classcommon {
char *class_str; char *class_str;
struct cil_class *class;
char *common_str; char *common_str;
struct cil_class *common;
}; };
struct cil_alias { struct cil_alias {
@ -433,7 +440,9 @@ struct cil_alias {
struct cil_aliasactual { struct cil_aliasactual {
char *alias_str; char *alias_str;
void *alias;
char *actual_str; char *actual_str;
void *actual;
}; };
struct cil_sid { struct cil_sid {
@ -444,6 +453,7 @@ struct cil_sid {
struct cil_sidcontext { struct cil_sidcontext {
char *sid_str; char *sid_str;
struct cil_sid *sid;
char *context_str; char *context_str;
struct cil_context *context; struct cil_context *context;
}; };
@ -465,6 +475,7 @@ struct cil_userattribute {
struct cil_userattributeset { struct cil_userattributeset {
char *attr_str; char *attr_str;
struct cil_userattribute *attr;
struct cil_list *str_expr; struct cil_list *str_expr;
struct cil_list *datum_expr; struct cil_list *datum_expr;
}; };
@ -478,12 +489,14 @@ struct cil_userrole {
struct cil_userlevel { struct cil_userlevel {
char *user_str; char *user_str;
void *user;
char *level_str; char *level_str;
struct cil_level *level; struct cil_level *level;
}; };
struct cil_userrange { struct cil_userrange {
char *user_str; char *user_str;
void *user;
char *range_str; char *range_str;
struct cil_levelrange *range; struct cil_levelrange *range;
}; };
@ -517,6 +530,7 @@ struct cil_roleattribute {
struct cil_roleattributeset { struct cil_roleattributeset {
char *attr_str; char *attr_str;
struct cil_roleattribute *attr;
struct cil_list *str_expr; struct cil_list *str_expr;
struct cil_list *datum_expr; struct cil_list *datum_expr;
}; };
@ -549,6 +563,7 @@ struct cil_typeattribute {
struct cil_typeattributeset { struct cil_typeattributeset {
char *attr_str; char *attr_str;
struct cil_typeattribute *attr;
struct cil_list *str_expr; struct cil_list *str_expr;
struct cil_list *datum_expr; struct cil_list *datum_expr;
}; };
@ -697,6 +712,7 @@ struct cil_catset {
struct cil_senscat { struct cil_senscat {
char *sens_str; char *sens_str;
struct cil_sens *sens;
struct cil_cats *cats; struct cil_cats *cats;
}; };
@ -925,7 +941,9 @@ struct cil_policycap {
struct cil_bounds { struct cil_bounds {
char *parent_str; char *parent_str;
void *parent;
char *child_str; char *child_str;
void *child;
}; };
/* Ensure that CIL uses the same values as sepol policydb.h */ /* Ensure that CIL uses the same values as sepol policydb.h */

16
libsepol/cil/src/cil_resolve_ast.c
View File

@ -216,6 +216,7 @@ int cil_resolve_classpermissionset(struct cil_tree_node *current, struct cil_cla
} }
cp = (struct cil_classpermission *)datum; cp = (struct cil_classpermission *)datum;
cps->set = cp;
if (cp->classperms == NULL) { if (cp->classperms == NULL) {
cil_list_init(&cp->classperms, CIL_CLASSPERMS); cil_list_init(&cp->classperms, CIL_CLASSPERMS);
@ -524,6 +525,7 @@ static int cil_resolve_aliasactual(struct cil_tree_node *current, struct cil_db
} }
alias = (struct cil_alias *)alias_datum; alias = (struct cil_alias *)alias_datum;
aliasactual->alias = alias_datum;
if (alias->actual != NULL) { if (alias->actual != NULL) {
cil_log(CIL_ERR, "%s %s cannot bind more than one value\n", cil_node_to_string(NODE(alias_datum)), alias_datum->name); cil_log(CIL_ERR, "%s %s cannot bind more than one value\n", cil_node_to_string(NODE(alias_datum)), alias_datum->name);
@ -532,6 +534,7 @@ static int cil_resolve_aliasactual(struct cil_tree_node *current, struct cil_db
} }
alias->actual = actual_datum; alias->actual = actual_datum;
aliasactual->actual = actual_datum;
return SEPOL_OK; return SEPOL_OK;
@ -773,6 +776,9 @@ int cil_resolve_classcommon(struct cil_tree_node *current, struct cil_db *db)
class->common = common; class->common = common;
clscom->class = class;
clscom->common = common;
cil_symtab_map(&class->perms, __class_update_perm_values, &common->num_perms); cil_symtab_map(&class->perms, __class_update_perm_values, &common->num_perms);
class->num_perms += common->num_perms; class->num_perms += common->num_perms;
@ -802,6 +808,7 @@ int cil_resolve_classmapping(struct cil_tree_node *current, struct cil_db *db)
goto exit; goto exit;
} }
map = (struct cil_class*)datum; map = (struct cil_class*)datum;
mapping->map_class = map;
rc = cil_symtab_get_datum(&map->perms, mapping->map_perm_str, &datum); rc = cil_symtab_get_datum(&map->perms, mapping->map_perm_str, &datum);
if (rc != SEPOL_OK) { if (rc != SEPOL_OK) {
@ -809,6 +816,7 @@ int cil_resolve_classmapping(struct cil_tree_node *current, struct cil_db *db)
} }
mp = (struct cil_perm*)datum; mp = (struct cil_perm*)datum;
mapping->map_perm = mp;
rc = cil_resolve_classperms_list(current, mapping->classperms, db); rc = cil_resolve_classperms_list(current, mapping->classperms, db);
if (rc != SEPOL_OK) { if (rc != SEPOL_OK) {
@ -877,6 +885,7 @@ int cil_resolve_userlevel(struct cil_tree_node *current, struct cil_db *db)
} }
user = (struct cil_user*)user_datum; user = (struct cil_user*)user_datum;
usrlvl->user = user;
if (usrlvl->level_str != NULL) { if (usrlvl->level_str != NULL) {
rc = cil_resolve_name(current, usrlvl->level_str, CIL_SYM_LEVELS, db, &lvl_datum); rc = cil_resolve_name(current, usrlvl->level_str, CIL_SYM_LEVELS, db, &lvl_datum);
@ -930,6 +939,7 @@ int cil_resolve_userrange(struct cil_tree_node *current, struct cil_db *db)
} }
user = (struct cil_user*)user_datum; user = (struct cil_user*)user_datum;
userrange->user = user;
if (userrange->range_str != NULL) { if (userrange->range_str != NULL) {
rc = cil_resolve_name(current, userrange->range_str, CIL_SYM_LEVELRANGES, db, &range_datum); rc = cil_resolve_name(current, userrange->range_str, CIL_SYM_LEVELRANGES, db, &range_datum);
@ -2190,6 +2200,7 @@ int cil_resolve_sidcontext(struct cil_tree_node *current, struct cil_db *db)
goto exit; goto exit;
} }
sid = (struct cil_sid*)sid_datum; sid = (struct cil_sid*)sid_datum;
sidcon->sid = sid;
if (sidcon->context_str != NULL) { if (sidcon->context_str != NULL) {
rc = cil_resolve_name(current, sidcon->context_str, CIL_SYM_CONTEXTS, db, &context_datum); rc = cil_resolve_name(current, sidcon->context_str, CIL_SYM_CONTEXTS, db, &context_datum);
@ -2315,6 +2326,8 @@ static int cil_resolve_blockabstract(struct cil_tree_node *current, struct cil_d
goto exit; goto exit;
} }
abstract->block = (struct cil_block *)block_datum;
cil_list_append(abstract_blocks, CIL_NODE, block_node); cil_list_append(abstract_blocks, CIL_NODE, block_node);
return SEPOL_OK; return SEPOL_OK;
@ -2335,6 +2348,8 @@ int cil_resolve_in(struct cil_tree_node *current, struct cil_db *db)
goto exit; goto exit;
} }
in->block = (struct cil_block *)block_datum;
block_node = NODE(block_datum); block_node = NODE(block_datum);
if (block_node->flavor == CIL_OPTIONAL) { if (block_node->flavor == CIL_OPTIONAL) {
@ -3364,6 +3379,7 @@ int cil_resolve_userattributeset(struct cil_tree_node *current, struct cil_db *d
goto exit; goto exit;
} }
attr = (struct cil_userattribute*)attr_datum; attr = (struct cil_userattribute*)attr_datum;
attrusers->attr = attr;
rc = cil_resolve_expr(CIL_USERATTRIBUTESET, attrusers->str_expr, &attrusers->datum_expr, current, db); rc = cil_resolve_expr(CIL_USERATTRIBUTESET, attrusers->str_expr, &attrusers->datum_expr, current, db);
if (rc != SEPOL_OK) { if (rc != SEPOL_OK) {

57
libsepol/cil/src/cil_write_ast.c
View File

@ -588,7 +588,7 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_IN: { case CIL_IN: {
struct cil_in *in = node->data; struct cil_in *in = node->data;
fprintf(out, "(in %s", in->block_str); fprintf(out, "(in %s", datum_or_str(DATUM(in->block), in->block_str));
if (!node->cl_head) if (!node->cl_head)
fprintf(out, ")"); fprintf(out, ")");
fprintf(out, "\n"); fprintf(out, "\n");
@ -667,7 +667,7 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_BLOCKABSTRACT: { case CIL_BLOCKABSTRACT: {
struct cil_blockabstract *abstract = node->data; struct cil_blockabstract *abstract = node->data;
fprintf(out, "(blockabstract %s)\n", abstract->block_str); fprintf(out, "(blockabstract %s)\n", datum_or_str(DATUM(abstract->block), abstract->block_str));
break; break;
} }
case CIL_MLS: { case CIL_MLS: {
@ -788,7 +788,9 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_CLASSCOMMON: { case CIL_CLASSCOMMON: {
struct cil_classcommon *cc = node->data; struct cil_classcommon *cc = node->data;
fprintf(out, "(classcommon %s %s)\n", cc->class_str, cc->common_str); fprintf(out, "(classcommon %s ", datum_or_str(DATUM(cc->class), cc->class_str));
fprintf(out, "%s", datum_or_str(DATUM(cc->common), cc->common_str));
fprintf(out, ")\n");
break; break;
} }
case CIL_CLASSPERMISSION: { case CIL_CLASSPERMISSION: {
@ -798,7 +800,7 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_CLASSPERMISSIONSET: { case CIL_CLASSPERMISSIONSET: {
struct cil_classpermissionset *cps = node->data; struct cil_classpermissionset *cps = node->data;
fprintf(out, "(classpermissionset %s ", cps->set_str); fprintf(out, "(classpermissionset %s ", datum_or_str(DATUM(cps->set), cps->set_str));
write_classperms_list(out, cps->classperms); write_classperms_list(out, cps->classperms);
fprintf(out, ")\n"); fprintf(out, ")\n");
break; break;
@ -812,7 +814,8 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_CLASSMAPPING: { case CIL_CLASSMAPPING: {
struct cil_classmapping *mapping = node->data; struct cil_classmapping *mapping = node->data;
fprintf(out, "(classmapping %s %s ", mapping->map_class_str, mapping->map_perm_str); fprintf(out, "(classmapping %s ", datum_or_str(DATUM(mapping->map_class), mapping->map_class_str));
fprintf(out, "%s ", datum_or_str(DATUM(mapping->map_perm), mapping->map_perm_str));
write_classperms_list(out, mapping->classperms); write_classperms_list(out, mapping->classperms);
fprintf(out, ")\n"); fprintf(out, ")\n");
break; break;
@ -833,7 +836,7 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_SIDCONTEXT: { case CIL_SIDCONTEXT: {
struct cil_sidcontext *sidcon = node->data; struct cil_sidcontext *sidcon = node->data;
fprintf(out, "(sidcontext %s ", sidcon->sid_str); fprintf(out, "(sidcontext %s ", datum_or_str(DATUM(sidcon->sid), sidcon->sid_str));
if (sidcon->context) if (sidcon->context)
write_context(out, sidcon->context, CIL_TRUE); write_context(out, sidcon->context, CIL_TRUE);
else else
@ -874,7 +877,9 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_SENSALIASACTUAL: { case CIL_SENSALIASACTUAL: {
struct cil_aliasactual *aliasactual = node->data; struct cil_aliasactual *aliasactual = node->data;
fprintf(out, "(sensitivityaliasactual %s %s)\n", aliasactual->alias_str, aliasactual->actual_str); fprintf(out, "(sensitivityaliasactual %s ", datum_or_str(DATUM(aliasactual->alias), aliasactual->alias_str));
fprintf(out, "%s", datum_or_str(DATUM(aliasactual->actual), aliasactual->actual_str));
fprintf(out, ")\n");
break; break;
} }
case CIL_CAT: { case CIL_CAT: {
@ -889,7 +894,9 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_CATALIASACTUAL: { case CIL_CATALIASACTUAL: {
struct cil_aliasactual *aliasactual = node->data; struct cil_aliasactual *aliasactual = node->data;
fprintf(out, "(categoryaliasactual %s %s)\n", aliasactual->alias_str, aliasactual->actual_str); fprintf(out, "(categoryaliasactual %s ", datum_or_str(DATUM(aliasactual->alias), aliasactual->alias_str));
fprintf(out, "%s", datum_or_str(DATUM(aliasactual->actual), aliasactual->actual_str));
fprintf(out, ")\n");
break; break;
} }
case CIL_CATSET: { case CIL_CATSET: {
@ -913,7 +920,7 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
case CIL_SENSCAT: { case CIL_SENSCAT: {
struct cil_senscat *senscat = node->data; struct cil_senscat *senscat = node->data;
fprintf(out, "(sensitivitycategory "); fprintf(out, "(sensitivitycategory ");
fprintf(out, "%s ", senscat->sens_str); fprintf(out, "%s ", datum_or_str(DATUM(senscat->sens), senscat->sens_str));
write_cats(out, senscat->cats); write_cats(out, senscat->cats);
fprintf(out, ")\n"); fprintf(out, ")\n");
break; break;
@ -955,7 +962,7 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_USERATTRIBUTESET: { case CIL_USERATTRIBUTESET: {
struct cil_userattributeset *attr = node->data; struct cil_userattributeset *attr = node->data;
fprintf(out, "(userattributeset %s ", attr->attr_str); fprintf(out, "(userattributeset %s ", datum_or_str(DATUM(attr->attr), attr->attr_str));
if (attr->datum_expr) if (attr->datum_expr)
write_expr(out, attr->datum_expr); write_expr(out, attr->datum_expr);
else else
@ -966,14 +973,14 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
case CIL_USERROLE: { case CIL_USERROLE: {
struct cil_userrole *userrole = node->data; struct cil_userrole *userrole = node->data;
fprintf(out, "(userrole "); fprintf(out, "(userrole ");
fprintf(out, "%s ", datum_or_str(userrole->user, userrole->user_str)); fprintf(out, "%s ", datum_or_str(DATUM(userrole->user), userrole->user_str));
fprintf(out, "%s", datum_or_str(userrole->role, userrole->role_str)); fprintf(out, "%s", datum_or_str(DATUM(userrole->role), userrole->role_str));
fprintf(out, ")\n"); fprintf(out, ")\n");
break; break;
} }
case CIL_USERLEVEL: { case CIL_USERLEVEL: {
struct cil_userlevel *userlevel = node->data; struct cil_userlevel *userlevel = node->data;
fprintf(out, "(userlevel %s ", userlevel->user_str); fprintf(out, "(userlevel %s ", datum_or_str(DATUM(userlevel->user), userlevel->user_str));
if (userlevel->level) if (userlevel->level)
write_level(out, userlevel->level, CIL_TRUE); write_level(out, userlevel->level, CIL_TRUE);
else else
@ -983,7 +990,7 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_USERRANGE: { case CIL_USERRANGE: {
struct cil_userrange *userrange = node->data; struct cil_userrange *userrange = node->data;
fprintf(out, "(userrange %s ", userrange->user_str); fprintf(out, "(userrange %s ", datum_or_str(DATUM(userrange->user), userrange->user_str));
if (userrange->range) if (userrange->range)
write_range(out, userrange->range, CIL_TRUE); write_range(out, userrange->range, CIL_TRUE);
else else
@ -993,7 +1000,9 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_USERBOUNDS: { case CIL_USERBOUNDS: {
struct cil_bounds *bounds = node->data; struct cil_bounds *bounds = node->data;
fprintf(out, "(userbounds %s %s)\n", bounds->parent_str, bounds->child_str); fprintf(out, "(userbounds ");
fprintf(out, "%s ", datum_or_str(DATUM(bounds->parent), bounds->parent_str));
fprintf(out, "%s)\n", datum_or_str(DATUM(bounds->child), bounds->child_str));
break; break;
} }
case CIL_USERPREFIX: { case CIL_USERPREFIX: {
@ -1035,7 +1044,7 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_ROLEATTRIBUTESET: { case CIL_ROLEATTRIBUTESET: {
struct cil_roleattributeset *attr = node->data; struct cil_roleattributeset *attr = node->data;
fprintf(out, "(roleattributeset %s ", attr->attr_str); fprintf(out, "(roleattributeset %s ", datum_or_str(DATUM(attr->attr), attr->attr_str));
if (attr->datum_expr) if (attr->datum_expr)
write_expr(out, attr->datum_expr); write_expr(out, attr->datum_expr);
else else
@ -1052,8 +1061,10 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
break; break;
} }
case CIL_ROLEBOUNDS: { case CIL_ROLEBOUNDS: {
struct cil_bounds *bnds = node->data; struct cil_bounds *bounds = node->data;
fprintf(out, "(rolebounds %s %s)\n", bnds->parent_str, bnds->child_str); fprintf(out, "(rolebounds ");
fprintf(out, "%s ", datum_or_str(DATUM(bounds->parent), bounds->parent_str));
fprintf(out, "%s)\n", datum_or_str(DATUM(bounds->child), bounds->child_str));
break; break;
} }
case CIL_TYPE: { case CIL_TYPE: {
@ -1066,7 +1077,9 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_TYPEALIASACTUAL: { case CIL_TYPEALIASACTUAL: {
struct cil_aliasactual *aliasactual = node->data; struct cil_aliasactual *aliasactual = node->data;
fprintf(out, "(typealiasactual %s %s)\n", aliasactual->alias_str, aliasactual->actual_str); fprintf(out, "(typealiasactual %s ", datum_or_str(DATUM(aliasactual->alias), aliasactual->alias_str));
fprintf(out, "%s", datum_or_str(DATUM(aliasactual->actual), aliasactual->actual_str));
fprintf(out, ")\n");
break; break;
} }
case CIL_TYPEATTRIBUTE: { case CIL_TYPEATTRIBUTE: {
@ -1075,7 +1088,7 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_TYPEATTRIBUTESET: { case CIL_TYPEATTRIBUTESET: {
struct cil_typeattributeset *attr = node->data; struct cil_typeattributeset *attr = node->data;
fprintf(out, "(typeattributeset %s ", attr->attr_str); fprintf(out, "(typeattributeset %s ", datum_or_str(DATUM(attr->attr), attr->attr_str));
if (attr->datum_expr) if (attr->datum_expr)
write_expr(out, attr->datum_expr); write_expr(out, attr->datum_expr);
else else
@ -1102,7 +1115,9 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
} }
case CIL_TYPEBOUNDS: { case CIL_TYPEBOUNDS: {
struct cil_bounds *bounds = node->data; struct cil_bounds *bounds = node->data;
fprintf(out, "(typebounds %s %s)\n", bounds->parent_str, bounds->child_str); fprintf(out, "(typebounds ");
fprintf(out, "%s ", datum_or_str(DATUM(bounds->parent), bounds->parent_str));
fprintf(out, "%s)\n", datum_or_str(DATUM(bounds->child), bounds->child_str));
break; break;
} }
case CIL_ROLEALLOW: { case CIL_ROLEALLOW: {