RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-01-22 21:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

expand_terule_helper: cleanups

Browse Source 
1. Use the new helper to convert from AVRULE to AVTAB values.
2. Only check once for invalid AVRULE specified parameter.
3. Drop assert and just return error on invalid specification.

Signed-off-by: William Roberts <william.c.roberts@intel.com>
This commit is contained in:
William Roberts 2016-11-17 08:56:08 -08:00 committed by Stephen Smalley
parent dcd473d5ae
commit 4129eb499d
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libsepol/src/expand.c
View File

@ -1691,26 +1691,22 @@ static int expand_terule_helper(sepol_handle_t * handle,
avtab_ptr_t node; avtab_ptr_t node;
class_perm_node_t *cur; class_perm_node_t *cur;
int conflict; int conflict;
uint32_t oldtype = 0, spec = 0; uint32_t oldtype = 0;
if (specified & AVRULE_TRANSITION) { if (!(specified & (AVRULE_TRANSITION|AVRULE_MEMBER|AVRULE_CHANGE))) {
spec = AVTAB_TRANSITION; ERR(handle, "Invalid specification: %"PRIu32"\n", specified);
} else if (specified & AVRULE_MEMBER) { return EXPAND_RULE_ERROR;
spec = AVTAB_MEMBER;
} else if (specified & AVRULE_CHANGE) {
spec = AVTAB_CHANGE;
} else {
assert(0); /* unreachable */
} }
avkey.specified = avrule_to_avtab_spec(specified);
avkey.source_type = stype + 1;
avkey.target_type = ttype + 1;
cur = perms; cur = perms;
while (cur) { while (cur) {
uint32_t remapped_data = uint32_t remapped_data =
typemap ? typemap[cur->data - 1] : cur->data; typemap ? typemap[cur->data - 1] : cur->data;
avkey.source_type = stype + 1;
avkey.target_type = ttype + 1;
avkey.target_class = cur->tclass; avkey.target_class = cur->tclass;
avkey.specified = spec;
conflict = 0; conflict = 0;
/* check to see if the expanded TE already exists -- /* check to see if the expanded TE already exists --
@ -1772,15 +1768,7 @@ static int expand_terule_helper(sepol_handle_t * handle,
} }
avdatump = &node->datum; avdatump = &node->datum;
if (specified & AVRULE_TRANSITION) { avdatump->data = remapped_data;
avdatump->data = remapped_data;
} else if (specified & AVRULE_MEMBER) {
avdatump->data = remapped_data;
} else if (specified & AVRULE_CHANGE) {
avdatump->data = remapped_data;
} else {
assert(0); /* should never occur */
}
cur = cur->next; cur = cur->next;
} }