RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libsepol/cil: Fix bugs when writing policy.conf rules 

The typebounds rules should end with a ";".

The netifcon and nodecon rules should not end with a ";".

The default rules are missing a "_". They should be "default_user",
"default_role" and "default_type".

Signed-off-by: James Carter <jwcart2@tycho.nsa.gov>
This commit is contained in:
James Carter 2017-06-14 13:30:21 -04:00
parent f2b5aae4aa
commit 5a553e8287
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libsepol/cil/src/cil_policy.c
View File

@ -1069,7 +1069,7 @@ static void cil_typebounds_to_policy(FILE *out, struct cil_list *types)
child = i1->data; child = i1->data;
if (child->bounds != NULL) { if (child->bounds != NULL) {
parent = child->bounds; parent = child->bounds;
fprintf(out, "typebounds %s %s\n", parent->datum.fqn, child->datum.fqn); fprintf(out, "typebounds %s %s;\n", parent->datum.fqn, child->datum.fqn);
} }
} }
} }
@ -1779,7 +1779,7 @@ static void cil_netifcons_to_policy(FILE *out, struct cil_sort *netifcons, int m
cil_context_to_policy(out, netifcon->if_context, mls); cil_context_to_policy(out, netifcon->if_context, mls);
fprintf(out, " "); fprintf(out, " ");
cil_context_to_policy(out, netifcon->packet_context, mls); cil_context_to_policy(out, netifcon->packet_context, mls);
fprintf(out, ";\n"); fprintf(out, "\n");
} }
} }
@ -1836,7 +1836,7 @@ static void cil_nodecons_to_policy(FILE *out, struct cil_sort *nodecons, int mls
} }
cil_context_to_policy(out, nodecon->context, mls); cil_context_to_policy(out, nodecon->context, mls);
fprintf(out, ";\n"); fprintf(out, "\n");
} }
} }
@ -1928,9 +1928,9 @@ void cil_gen_policy(FILE *out, struct cil_db *db)
cil_commons_to_policy(out, lists[CIL_LIST_COMMON]); cil_commons_to_policy(out, lists[CIL_LIST_COMMON]);
cil_classes_to_policy(out, db->classorder); cil_classes_to_policy(out, db->classorder);
cil_defaults_to_policy(out, lists[CIL_LIST_DEFAULT_USER], CIL_KEY_DEFAULTUSER); cil_defaults_to_policy(out, lists[CIL_LIST_DEFAULT_USER], "default_user");
cil_defaults_to_policy(out, lists[CIL_LIST_DEFAULT_ROLE], CIL_KEY_DEFAULTROLE); cil_defaults_to_policy(out, lists[CIL_LIST_DEFAULT_ROLE], "default_role");
cil_defaults_to_policy(out, lists[CIL_LIST_DEFAULT_TYPE], CIL_KEY_DEFAULTTYPE); cil_defaults_to_policy(out, lists[CIL_LIST_DEFAULT_TYPE], "default_type");
if (db->mls == CIL_TRUE) { if (db->mls == CIL_TRUE) {
cil_default_ranges_to_policy(out, lists[CIL_LIST_DEFAULT_RANGE]); cil_default_ranges_to_policy(out, lists[CIL_LIST_DEFAULT_RANGE]);