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

Add permissive type support

Browse Source
This commit is contained in:
Joshua Brindle 2013-07-16 19:51:26 -04:00
parent dd80f1b997
commit 1759add2b6
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sepolicy-inject.c
View File

@ -19,6 +19,7 @@
void usage(char *arg0) { void usage(char *arg0) {
fprintf(stderr, "%s -s <source type> -t <target type> -c <class> -p <perm> -P <policy file> -o <output file>\n", arg0); fprintf(stderr, "%s -s <source type> -t <target type> -c <class> -p <perm> -P <policy file> -o <output file>\n", arg0);
fprintf(stderr, "%s -Z permissive_type -P <policy file> -o <output file>\n", arg0);
exit(1); exit(1);
} }
@ -134,7 +135,7 @@ int load_policy(char *filename, policydb_t *policydb, struct policy_file *pf) {
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char *policy = NULL, *source = NULL, *target = NULL, *class = NULL, *perm = NULL, *outfile = NULL; char *policy = NULL, *source = NULL, *target = NULL, *class = NULL, *perm = NULL, *outfile = NULL, *permissive = NULL;
policydb_t policydb; policydb_t policydb;
struct policy_file pf, outpf; struct policy_file pf, outpf;
sidtab_t sidtab; sidtab_t sidtab;
@ -149,10 +150,11 @@ int main(int argc, char **argv)
{"perm", required_argument, NULL, 'p'}, {"perm", required_argument, NULL, 'p'},
{"policy", required_argument, NULL, 'P'}, {"policy", required_argument, NULL, 'P'},
{"output", required_argument, NULL, 'o'}, {"output", required_argument, NULL, 'o'},
{"permissive", required_argument, NULL, 'Z'},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
while ((ch = getopt_long(argc, argv, "s:t:c:p:P:o:", long_options, NULL)) != -1) { while ((ch = getopt_long(argc, argv, "s:t:c:p:P:o:Z:", long_options, NULL)) != -1) {
switch (ch) { switch (ch) {
case 's': case 's':
source = optarg; source = optarg;
@ -172,12 +174,15 @@ int main(int argc, char **argv)
case 'o': case 'o':
outfile = optarg; outfile = optarg;
break; break;
case 'Z':
permissive = optarg;
break;
default: default:
usage(argv[0]); usage(argv[0]);
} }
} }
if (!source || !target || !class || !perm || !policy) if (((!source || !target || !class || !perm) && !permissive) || !policy)
usage(argv[0]); usage(argv[0]);
sepol_set_policydb(&policydb); sepol_set_policydb(&policydb);
@ -191,9 +196,22 @@ int main(int argc, char **argv)
if (policydb_load_isids(&policydb, &sidtab)) if (policydb_load_isids(&policydb, &sidtab))
return 1; return 1;
if (add_rule(source, target, class, perm, &policydb)) { if (permissive) {
fprintf(stderr, "Could not add rule\n"); type_datum_t *type;
return 1; type = hashtab_search(policydb.p_types.table, permissive);
if (type == NULL) {
fprintf(stderr, "type %s does not exist\n", permissive);
return 1;
}
if (ebitmap_set_bit(&policydb.permissive_map, type->s.value, 1)) {
fprintf(stderr, "Could not set bit in permissive map\n");
return 1;
}
} else {
if (add_rule(source, target, class, perm, &policydb)) {
fprintf(stderr, "Could not add rule\n");
return 1;
}
} }
fp = fopen(outfile, "w"); fp = fopen(outfile, "w");