MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix set_attr

Browse Source
This commit is contained in:
Pierre-Hugues Husson 2015-10-26 00:11:37 +01:00
parent a2fd45bb95
commit e1a69b97db
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sepolicy-inject.c
View File

@ -37,6 +37,18 @@ void *cmalloc(size_t s) {
return t; return t;
} }
int get_attr(char *type, int value, policydb_t *policy) {
type_datum_t *attr = hashtab_search(policy->p_types.table, type);
if (!attr)
exit(1);
if (attr->flavor != TYPE_ATTRIB)
exit(1);
return !! ebitmap_get_bit(&policy->attr_type_map[attr->s.value-1], value-1);
//return !! ebitmap_get_bit(&policy->type_attr_map[value-1], attr->s.value-1);
}
int set_attr(char *type, int value, policydb_t *policy) { int set_attr(char *type, int value, policydb_t *policy) {
type_datum_t *attr = hashtab_search(policy->p_types.table, type); type_datum_t *attr = hashtab_search(policy->p_types.table, type);
if (!attr) if (!attr)
@ -45,7 +57,9 @@ int set_attr(char *type, int value, policydb_t *policy) {
if (attr->flavor != TYPE_ATTRIB) if (attr->flavor != TYPE_ATTRIB)
exit(1); exit(1);
if (ebitmap_set_bit(&attr->types, value - 1, 1)) if(ebitmap_set_bit(&policy->type_attr_map[value-1], attr->s.value-1, 1))
exit(1);
if(ebitmap_set_bit(&policy->attr_type_map[attr->s.value-1], value-1, 1))
exit(1); exit(1);
return 0; return 0;
@ -218,7 +232,8 @@ int add_type(char *domainS, char *typeS, policydb_t *policy) {
return 1; return 1;
} }
return set_attr(typeS, domain->s.value, policy); set_attr(typeS, domain->s.value, policy);
return 0;
} }
int load_policy(char *filename, policydb_t *policydb, struct policy_file *pf) { int load_policy(char *filename, policydb_t *policydb, struct policy_file *pf) {
@ -362,7 +377,8 @@ int main(int argc, char **argv)
} else if(fcon) { } else if(fcon) {
add_transition(source, fcon, target, class, &policydb); add_transition(source, fcon, target, class, &policydb);
} else if(trust) { } else if(trust) {
add_type("su", "mlstrustedobject", &policydb); add_type(trust, "mlstrustedobject", &policydb);
add_type(trust, "mlstrustedsubject", &policydb);
} else { } else {
create_domain(source, &policydb); create_domain(source, &policydb);
if (add_rule(source, target, class, perm, &policydb)) { if (add_rule(source, target, class, perm, &policydb)) {