summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-05-31 05:03:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-05-31 05:03:05 +0000
commit252b0e2b46e3d5e71a8b5c55928dc9ca62811f0a (patch)
tree72b962c61caa5495097a458578e6bb485cd7da46 /init
parent570cd46d14645f622e9972671308fdb4f2425292 (diff)
parent03daf05dcfbdbf4ed6175afb2f4676e59dd74aa3 (diff)
downloadsystem_core-252b0e2b46e3d5e71a8b5c55928dc9ca62811f0a.zip
system_core-252b0e2b46e3d5e71a8b5c55928dc9ca62811f0a.tar.gz
system_core-252b0e2b46e3d5e71a8b5c55928dc9ca62811f0a.tar.bz2
Merge "SELinux changes to check policy versions during a reload."
Diffstat (limited to 'init')
-rw-r--r--init/init.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/init/init.c b/init/init.c
index 1538aa6..7ba25dc 100644
--- a/init/init.c
+++ b/init/init.c
@@ -841,24 +841,21 @@ static int bootchart_init_action(int nargs, char **args)
static const struct selinux_opt seopts_prop[] = {
{ SELABEL_OPT_PATH, "/property_contexts" },
+ { SELABEL_OPT_PATH, "/data/security/current/property_contexts" },
{ 0, NULL }
};
struct selabel_handle* selinux_android_prop_context_handle(void)
{
- int i = 0;
- struct selabel_handle* sehandle = NULL;
- while ((sehandle == NULL) && seopts_prop[i].value) {
- sehandle = selabel_open(SELABEL_CTX_ANDROID_PROP, &seopts_prop[i], 1);
- i++;
- }
-
+ int policy_index = selinux_android_use_data_policy() ? 1 : 0;
+ struct selabel_handle* sehandle = selabel_open(SELABEL_CTX_ANDROID_PROP,
+ &seopts_prop[policy_index], 1);
if (!sehandle) {
ERROR("SELinux: Could not load property_contexts: %s\n",
strerror(errno));
return NULL;
}
- INFO("SELinux: Loaded property contexts from %s\n", seopts_prop[i - 1].value);
+ INFO("SELinux: Loaded property contexts from %s\n", seopts_prop[policy_index].value);
return sehandle;
}