aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-16 20:21:10 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-16 20:21:10 +0000
commit0848cbdb6a97bc524a45cfe56d7da81fbaa5ff35 (patch)
tree9572c09bc52b745df7b11a22da0258a55f96ad1d
parenta6a5d48a40d55a9dc23225a1cd68aed3ce208ddf (diff)
parentbefd9372d7a3afa73011455a6ec00da17cfcf6ea (diff)
downloadselinux-0848cbdb6a97bc524a45cfe56d7da81fbaa5ff35.tar.gz
Snap for 10957012 from befd9372d7a3afa73011455a6ec00da17cfcf6ea to simpleperf-release
Change-Id: Iec22a8b87675ca1a6cd74bab3e05030d342f4d48
-rw-r--r--libselinux/src/android/android.c3
-rw-r--r--libselinux/src/android/android_internal.h4
-rw-r--r--libselinux/src/android/android_seapp.c10
3 files changed, 5 insertions, 12 deletions
diff --git a/libselinux/src/android/android.c b/libselinux/src/android/android.c
index 4e330599..83066118 100644
--- a/libselinux/src/android/android.c
+++ b/libselinux/src/android/android.c
@@ -22,9 +22,6 @@ static const path_alts_t service_context_paths = { .paths = {
"/plat_service_contexts"
},
{
- "/dev/selinux/apex_service_contexts"
- },
- {
"/system_ext/etc/selinux/system_ext_service_contexts",
"/system_ext_service_contexts"
},
diff --git a/libselinux/src/android/android_internal.h b/libselinux/src/android/android_internal.h
index 4960e729..0f11ce8a 100644
--- a/libselinux/src/android/android_internal.h
+++ b/libselinux/src/android/android_internal.h
@@ -11,8 +11,8 @@ extern "C" {
#endif
// Context files (file_contexts, service_contexts, etc) may be spread over
-// multiple partitions: system, apex, system_ext, product, vendor and/or odm.
-#define MAX_CONTEXT_PATHS 6
+// multiple partitions: system, system_ext, product, vendor and/or odm.
+#define MAX_CONTEXT_PATHS 5
// The maximum number of alternatives for a file on one partition.
#define MAX_ALT_CONTEXT_PATHS 2
typedef struct path_alts {
diff --git a/libselinux/src/android/android_seapp.c b/libselinux/src/android/android_seapp.c
index 273ac72c..e29c74e9 100644
--- a/libselinux/src/android/android_seapp.c
+++ b/libselinux/src/android/android_seapp.c
@@ -28,9 +28,6 @@ static const path_alts_t file_context_paths = { .paths = {
"/plat_file_contexts"
},
{
- "/dev/selinux/apex_file_contexts",
- },
- {
"/system_ext/etc/selinux/system_ext_file_contexts",
"/system_ext_file_contexts"
},
@@ -52,6 +49,9 @@ static const path_alts_t file_context_paths = { .paths = {
* each partition, only the first existing entry will be used (for example, if
* /system/etc/selinux/plat_seapp_contexts exists, /plat_seapp_contexts will be
* ignored).
+ *
+ * PLEASE KEEP IN SYNC WITH:
+ * hostsidetests/security/src/android/security/cts/SELinuxHostTest.java
*/
static const path_alts_t seapp_context_paths = { .paths = {
{
@@ -59,9 +59,6 @@ static const path_alts_t seapp_context_paths = { .paths = {
"/plat_seapp_contexts"
},
{
- "/dev/selinux/apex_seapp_contexts",
- },
- {
"/system_ext/etc/selinux/system_ext_seapp_contexts",
"/system_ext_seapp_contexts"
},
@@ -79,7 +76,6 @@ static const path_alts_t seapp_context_paths = { .paths = {
}
}, .partitions= {
"system",
- "system", // regard APEX sepolicy as system
"system_ext",
"product",
"vendor",