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

Merge attribute allow with type allow

Browse Source
This commit is contained in:
topjohnwu 2017-02-04 04:24:22 +08:00
parent 91de738563
commit 76eb629fc2
4 changed files with 77 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main.c
View File

@ -167,9 +167,12 @@ int main(int argc, char *argv[]) {
void *data = NULL; void *data = NULL;
size_t len; size_t len;
policydb_to_image(NULL, policy, &data, &len); policydb_to_image(NULL, policy, &data, &len);
if (data == NULL) fprintf(stderr, "Error!"); if (data == NULL) {
fprintf(stderr, "Fail to dump policydb image!");
return 1;
}
fd = open(outfile, O_RDWR | O_CREAT); fd = open(outfile, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "Can't open '%s': %s\n", fprintf(stderr, "Can't open '%s': %s\n",
outfile, strerror(errno)); outfile, strerror(errno));

17
sepolicy-inject.h
View File

@ -22,18 +22,23 @@
#include <sepol/policydb/conditional.h> #include <sepol/policydb/conditional.h>
#include <sepol/policydb/constraint.h> #include <sepol/policydb/constraint.h>
// hashtab traversal macro
#define hashtab_for_each(table, ptr) \
for (int _i = 0; _i < table->size; ++_i) \
for (*ptr = table->htable[_i]; *ptr != NULL; *ptr = (*ptr)->next)
// Global policydb // Global policydb
policydb_t *policy; policydb_t *policy;
// sepolicy manipulation functions // sepolicy manipulation functions
int load_policy(char *filename, policydb_t *policydb, struct policy_file *pf); int load_policy(char *filename, policydb_t *policydb, struct policy_file *pf);
void create_domain(char *d); void create_domain(char *d);
int set_domain_state(char* s, int state);
int add_file_transition(char *srcS, char *origS, char *tgtS, char *c, char* filename); int add_file_transition(char *srcS, char *origS, char *tgtS, char *c, char* filename);
int add_transition(char *srcS, char *origS, char *tgtS, char *c); int add_transition(char *srcS, char *origS, char *tgtS, char *c);
int add_typeattribute(char *domainS, char *typeS); int add_typeattribute(char *domainS, char *typeS);
int add_rule(char *s, char *t, char *c, char *p, int effect, int not); int add_rule(char *s, char *t, char *c, char *p, int effect, int not);
int add_typerule(char *s, char *targetAttribute, char **minusses, char *c, char *p, int effect, int not); int add_typerule(char *s, char *targetAttribute, char **minusses, char *c, char *p, int effect, int not);
int live_patch();
// Handy functions // Handy functions
void allow(char *s, char *t, char *c, char *p); void allow(char *s, char *t, char *c, char *p);
@ -46,14 +51,14 @@ void attradd(char *s, char *a);
int exists(char *source); int exists(char *source);
// Vector of char* // Vector of char*
struct vector { typedef struct vector {
size_t size; size_t size;
size_t cap; size_t cap;
char **data; char **data;
}; } vector;
void vec_init(struct vector *v); void vec_init(vector *v);
void vec_push_back(struct vector *v, char* s); void vec_push_back(vector *v, char* s);
void vec_destroy(struct vector *v); void vec_destroy(vector *v);
// Built in rules // Built in rules
void su_rules(); void su_rules();

170
sepolicy.c
View File

@ -76,70 +76,64 @@ static int add_irule(int s, int t, int c, int p, int effect, int not) {
} }
static int add_rule_auto(type_datum_t *src, type_datum_t *tgt, class_datum_t *cls, perm_datum_t *perm, int effect, int not) { static int add_rule_auto(type_datum_t *src, type_datum_t *tgt, class_datum_t *cls, perm_datum_t *perm, int effect, int not) {
hashtab_t type_table, class_table, perm_table;
hashtab_ptr_t cur; hashtab_ptr_t cur;
int ret = 0;
type_table = policy->p_types.table;
class_table = policy->p_classes.table;
if (src == NULL) { if (src == NULL) {
for (int i = 0; i < type_table->size; ++i) { hashtab_for_each(policy->p_types.table, &cur) {
cur = type_table->htable[i];
while (cur != NULL) {
src = cur->datum; src = cur->datum;
if(add_rule_auto(src, tgt, cls, perm, effect, not)) if(add_rule_auto(src, tgt, cls, perm, effect, not))
return 1; return 1;
cur = cur->next;
}
} }
} else if (tgt == NULL) { } else if (tgt == NULL) {
for (int i = 0; i < type_table->size; ++i) { hashtab_for_each(policy->p_types.table, &cur) {
cur = type_table->htable[i];
while (cur != NULL) {
tgt = cur->datum; tgt = cur->datum;
if(add_rule_auto(src, tgt, cls, perm, effect, not)) if(add_rule_auto(src, tgt, cls, perm, effect, not))
return 1; return 1;
cur = cur->next;
}
} }
} else if (cls == NULL) { } else if (cls == NULL) {
for (int i = 0; i < class_table->size; ++i) { hashtab_for_each(policy->p_classes.table, &cur) {
cur = class_table->htable[i];
while (cur != NULL) {
cls = cur->datum; cls = cur->datum;
if(add_rule_auto(src, tgt, cls, perm, effect, not)) if(add_rule_auto(src, tgt, cls, perm, effect, not))
return 1; return 1;
cur = cur->next;
}
} }
} else if (perm == NULL) { } else if (perm == NULL) {
perm_table = cls->permissions.table; hashtab_for_each(cls->permissions.table, &cur) {
for (int i = 0; i < perm_table->size; ++i) {
cur = perm_table->htable[i];
while (cur != NULL) {
perm = cur->datum; perm = cur->datum;
if(add_irule(src->s.value, tgt->s.value, cls->s.value, perm->s.value, effect, not)) if(add_rule_auto(src, tgt, cls, perm, effect, not))
return 1; return 1;
cur = cur->next;
}
} }
if (cls->comdatum != NULL) { if (cls->comdatum != NULL) {
perm_table = cls->comdatum->permissions.table; hashtab_for_each(cls->comdatum->permissions.table, &cur) {
for (int i = 0; i < perm_table->size; ++i) {
cur = perm_table->htable[i];
while (cur != NULL) {
perm = cur->datum; perm = cur->datum;
if(add_irule(src->s.value, tgt->s.value, cls->s.value, perm->s.value, effect, not)) if(add_rule_auto(src, tgt, cls, perm, effect, not))
return 1; return 1;
cur = cur->next;
}
} }
} }
} else { } else {
return add_irule(src->s.value, tgt->s.value, cls->s.value, perm->s.value, effect, not); ebitmap_node_t *s_node, *t_node;
int i, j;
if (src->flavor == TYPE_ATTRIB) {
if (tgt->flavor == TYPE_ATTRIB) {
ebitmap_for_each_bit(&policy->attr_type_map[src->s.value-1], s_node, i)
ebitmap_for_each_bit(&policy->attr_type_map[tgt->s.value-1], t_node, j)
if(ebitmap_node_get_bit(s_node, i) && ebitmap_node_get_bit(t_node, j))
ret |= add_irule(i + 1, j + 1, cls->s.value, perm->s.value, effect, not);
} else {
ebitmap_for_each_bit(&policy->attr_type_map[src->s.value-1], s_node, i)
if(ebitmap_node_get_bit(s_node, i))
ret |= add_irule(i + 1, tgt->s.value, cls->s.value, perm->s.value, effect, not);
} }
return 0; } else if (tgt->flavor == TYPE_ATTRIB) {
ebitmap_for_each_bit(&policy->attr_type_map[tgt->s.value-1], t_node, j)
if(ebitmap_node_get_bit(t_node, j))
ret |= add_irule(src->s.value, j + 1, cls->s.value, perm->s.value, effect, not);
} else
ret = add_irule(src->s.value, tgt->s.value, cls->s.value, perm->s.value, effect, not);
}
return ret;
} }
int load_policy(char *filename, policydb_t *policydb, struct policy_file *pf) { int load_policy(char *filename, policydb_t *policydb, struct policy_file *pf) {
@ -175,7 +169,7 @@ int load_policy(char *filename, policydb_t *policydb, struct policy_file *pf) {
fprintf(stderr, "policydb_init: Out of memory!\n"); fprintf(stderr, "policydb_init: Out of memory!\n");
return 1; return 1;
} }
ret = policydb_read(policydb, pf, 1); ret = policydb_read(policydb, pf, 0);
if (ret) { if (ret) {
fprintf(stderr, "error(s) encountered while parsing configuration\n"); fprintf(stderr, "error(s) encountered while parsing configuration\n");
return 1; return 1;
@ -229,82 +223,26 @@ void create_domain(char *d) {
if(policydb_index_classes(policy)) if(policydb_index_classes(policy))
exit(1); exit(1);
if(policydb_index_others(NULL, policy, 1)) if(policydb_index_others(NULL, policy, 0))
exit(1); exit(1);
set_attr("domain", value); set_attr("domain", value);
} }
int add_typerule(char *s, char *targetAttribute, char **minusses, char *c, char *p, int effect, int not) { int set_domain_state(char* s, int state) {
type_datum_t *src, *tgt; type_datum_t *type;
class_datum_t *cls; if (!exists(s))
perm_datum_t *perm; create_domain(s);
type = hashtab_search(policy->p_types.table, s);
//64(0kB) should be enough for everyone, right? if (type == NULL) {
int m[64] = { -1 }; fprintf(stderr, "type %s does not exist\n", s);
src = hashtab_search(policy->p_types.table, s);
if (src == NULL) {
fprintf(stderr, "source type %s does not exist\n", s);
return 1; return 1;
} }
if (ebitmap_set_bit(&policy->permissive_map, type->s.value, state)) {
tgt = hashtab_search(policy->p_types.table, targetAttribute); fprintf(stderr, "Could not set bit in permissive map\n");
if (tgt == NULL) {
fprintf(stderr, "target type %s does not exist\n", targetAttribute);
return 1; return 1;
} }
if(tgt->flavor != TYPE_ATTRIB) return 0;
exit(1);
for(int i=0; minusses && minusses[i]; ++i) {
type_datum_t *obj;
obj = hashtab_search(policy->p_types.table, minusses[i]);
if (obj == NULL) {
fprintf(stderr, "minus type %s does not exist\n", minusses[i]);
return 1;
}
m[i] = obj->s.value-1;
m[i+1] = -1;
}
cls = hashtab_search(policy->p_classes.table, c);
if (cls == NULL) {
fprintf(stderr, "class %s does not exist\n", c);
return 1;
}
perm = hashtab_search(cls->permissions.table, p);
if (perm == NULL) {
if (cls->comdatum == NULL) {
fprintf(stderr, "perm %s does not exist in class %s\n", p, c);
return 1;
}
perm = hashtab_search(cls->comdatum->permissions.table, p);
if (perm == NULL) {
fprintf(stderr, "perm %s does not exist in class %s\n", p, c);
return 1;
}
}
ebitmap_node_t *node;
int i;
int ret = 0;
ebitmap_for_each_bit(&policy->attr_type_map[tgt->s.value-1], node, i) {
if(ebitmap_node_get_bit(node, i)) {
int found = 0;
for(int j=0; m[j] != -1; ++j) {
if(i == m[j])
found = 1;
}
if(!found)
ret |= add_irule(src->s.value, i+1, cls->s.value, perm->s.value, effect, not);
}
}
return ret;
} }
int add_transition(char *srcS, char *origS, char *tgtS, char *c) { int add_transition(char *srcS, char *origS, char *tgtS, char *c) {
@ -472,29 +410,3 @@ int add_rule(char *s, char *t, char *c, char *p, int effect, int not) {
} }
return add_rule_auto(src, tgt, cls, perm, effect, not); return add_rule_auto(src, tgt, cls, perm, effect, not);
} }
int live_patch() {
char *filename = "/sys/fs/selinux/load";
int fd, ret;
void *data = NULL;
size_t len;
policydb_to_image(NULL, policy, &data, &len);
if (data == NULL) fprintf(stderr, "Error!");
// based on libselinux security_load_policy()
fd = open(filename, O_RDWR);
if (fd < 0) {
fprintf(stderr, "Can't open '%s': %s\n",
filename, strerror(errno));
return 1;
}
ret = write(fd, data, len);
close(fd);
if (ret < 0) {
fprintf(stderr, "Could not write policy to %s\n",
filename);
return 1;
}
return 0;
}

25
utils.c
View File

@ -1,27 +1,12 @@
#include "sepolicy-inject.h" #include "sepolicy-inject.h"
static void set_domain(char* s, int value) { void vec_init(vector *v) {
type_datum_t *type;
if (!exists(s))
create_domain(s);
type = hashtab_search(policy->p_types.table, s);
if (type == NULL) {
fprintf(stderr, "type %s does not exist\n", s);
return;
}
if (ebitmap_set_bit(&policy->permissive_map, type->s.value, value)) {
fprintf(stderr, "Could not set bit in permissive map\n");
return;
}
}
void vec_init(struct vector *v) {
v->size = 0; v->size = 0;
v->cap = 1; v->cap = 1;
v->data = (char**) malloc(sizeof(char*)); v->data = (char**) malloc(sizeof(char*));
} }
void vec_push_back(struct vector *v, char* s) { void vec_push_back(vector *v, char* s) {
if (v == NULL) return; if (v == NULL) return;
if (v->size == v->cap) { if (v->size == v->cap) {
v->cap *= 2; v->cap *= 2;
@ -31,7 +16,7 @@ void vec_push_back(struct vector *v, char* s) {
++v->size; ++v->size;
} }
void vec_destroy(struct vector *v) { void vec_destroy(vector *v) {
v->size = 0; v->size = 0;
v->cap = 0; v->cap = 0;
free(v->data); free(v->data);
@ -54,11 +39,11 @@ void auditdeny(char *s, char *t, char *c, char *p) {
} }
void permissive(char *s) { void permissive(char *s) {
set_domain(s, 1); set_domain_state(s, 1);
} }
void enforce(char *s) { void enforce(char *s) {
set_domain(s, 0); set_domain_state(s, 0);
} }
void attradd(char *s, char *a) { void attradd(char *s, char *a) {