TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-27 20:15:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upstream external/selinux

Browse Source 
Fix #2645
This commit is contained in:
topjohnwu 2020-09-04 19:20:08 -07:00
parent 11f254e5e5
commit c3586fe0a5
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/external/selinux vendored

@ -1 +1 @@
Subproject commit a54be053299c04658d64229468a004ca40b6b4d5 Subproject commit 969114cff6ee973f47a3c84cacdef77e504d7bd9

30
native/jni/magiskpolicy/sepolicy.cpp
View File

@ -398,7 +398,6 @@ bool sepol_impl::add_type_rule(const char *s, const char *t, const char *c, cons
bool sepol_impl::add_filename_trans(const char *s, const char *t, const char *c, const char *d, const char *o) { bool sepol_impl::add_filename_trans(const char *s, const char *t, const char *c, const char *d, const char *o) {
type_datum_t *src, *tgt, *def; type_datum_t *src, *tgt, *def;
class_datum_t *cls; class_datum_t *cls;
filename_trans_datum_t *trans;
src = hashtab_find(db->p_types.table, s); src = hashtab_find(db->p_types.table, s);
if (src == nullptr) { if (src == nullptr) {
@ -421,22 +420,37 @@ bool sepol_impl::add_filename_trans(const char *s, const char *t, const char *c,
return false; return false;
} }
filename_trans_t key; filename_trans_key_t key;
key.stype = src->s.value;
key.ttype = tgt->s.value; key.ttype = tgt->s.value;
key.tclass = cls->s.value; key.tclass = cls->s.value;
key.name = (char *) o; key.name = (char *) o;
trans = hashtab_find(db->filename_trans, (hashtab_key_t) &key); filename_trans_datum_t *last = nullptr;
filename_trans_datum_t *trans = hashtab_find(db->filename_trans, (hashtab_key_t) &key);
while (trans) {
if (ebitmap_get_bit(&trans->stypes, src->s.value - 1)) {
// Duplicate, overwrite existing data and return
trans->otype = def->s.value;
return true;
}
if (trans->otype == def->s.value)
break;
last = trans;
trans = trans->next;
}
if (trans == nullptr) { if (trans == nullptr) {
trans = auto_cast(xcalloc(sizeof(*trans), 1)); trans = auto_cast(xcalloc(sizeof(*trans), 1));
hashtab_insert(db->filename_trans, (hashtab_key_t) &key, trans); filename_trans_key_t *new_key = auto_cast(malloc(sizeof(*new_key)));
*new_key = key;
new_key->name = strdup(key.name);
trans->next = last;
trans->otype = def->s.value;
hashtab_insert(db->filename_trans, (hashtab_key_t) new_key, trans);
} }
// Overwrite existing db->filename_trans_count++;
trans->otype = def->s.value; return ebitmap_set_bit(&trans->stypes, src->s.value - 1, 1) == 0;
return true;
} }
bool sepol_impl::add_genfscon(const char *fs_name, const char *path, const char *context) { bool sepol_impl::add_genfscon(const char *fs_name, const char *path, const char *context) {