From e33a5eb3070de5a037c78bbc8936fa4c248b0ebc Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 14 Jul 2017 00:51:42 +0800 Subject: [PATCH] Set proper selinux context for /sbin re-link --- jni/magiskhide/hide_utils.c | 10 +++++++--- jni/magiskpolicy | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jni/magiskhide/hide_utils.c b/jni/magiskhide/hide_utils.c index 78c61e2af..e409d5aff 100644 --- a/jni/magiskhide/hide_utils.c +++ b/jni/magiskhide/hide_utils.c @@ -78,10 +78,14 @@ void relink_sbin() { dir = xopendir("/sbin_orig"); while ((entry = xreaddir(dir))) { - snprintf(from, sizeof(from), "%s/%s", "/sbin_orig", entry->d_name); - snprintf(to, sizeof(to), "%s/%s", "/dev/sbin_bind", entry->d_name); + if (strcmp(entry->d_name, "..") == 0) + continue; + snprintf(from, sizeof(from), "/sbin_orig/%s", entry->d_name); + if (entry->d_type == DT_LNK) + xreadlink(from, from, sizeof(from)); + snprintf(to, sizeof(to), "/dev/sbin_bind/%s", entry->d_name); symlink(from, to); - lsetfilecon(to, "u:object_r:system_file:s0"); + lsetfilecon(to, "u:object_r:rootfs:s0"); } closedir(dir); diff --git a/jni/magiskpolicy b/jni/magiskpolicy index 4c7e081e1..c1c6f55f8 160000 --- a/jni/magiskpolicy +++ b/jni/magiskpolicy @@ -1 +1 @@ -Subproject commit 4c7e081e158b1d6a56a76b98f61d880f3d8a994d +Subproject commit c1c6f55f8f51cd24b5f926059e32d4a70a422430