aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2013-09-30 13:54:09 -0400
committerSteve Kondik <shade@chemlab.org>2014-02-28 13:49:11 +0100
commit58091908d82bd02db9726c35cb4a320b5d27fb93 (patch)
tree38c37b8d1ea8c994fd29a7aa10cd974a3edbece4
parent13cb7466630ac955eaa3cf53977bf172f18d11b7 (diff)
downloadandroid_external_sepolicy-58091908d82bd02db9726c35cb4a320b5d27fb93.tar.gz
android_external_sepolicy-58091908d82bd02db9726c35cb4a320b5d27fb93.tar.bz2
android_external_sepolicy-58091908d82bd02db9726c35cb4a320b5d27fb93.zip
Label adb keys file and allow access to it.
The /adb_keys entry will only take effect if a restorecon is applied by init.rc on a kernel that includes the rootfs labeling support, but does no harm otherwise. The /data/misc/adb labeling ensures correct labeling of the adb_keys file created if the device has ro.adb.secure=1 set. Allow adbd to read the file. Change-Id: I97b3d86a69681330bba549491a2fb39df6cf20ef Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
-rw-r--r--adbd.te8
-rw-r--r--file.te1
-rw-r--r--file_contexts3
3 files changed, 11 insertions, 1 deletions
diff --git a/adbd.te b/adbd.te
index 8f2ac30..4f332b3 100644
--- a/adbd.te
+++ b/adbd.te
@@ -6,3 +6,11 @@ unconfined_domain(adbd)
domain_auto_trans(adbd, shell_exec, shell)
# this is an entrypoint
allow adbd rootfs:file entrypoint;
+
+# Read /data/misc/adb/adb_keys.
+allow adbd adb_keys_file:dir search;
+allow adbd adb_keys_file:file r_file_perms;
+
+# Allow access in case /data/misc/adb still has the old type.
+allow adbd system_data_file:dir search;
+allow adbd system_data_file:file r_file_perms;
diff --git a/file.te b/file.te
index aefa9a6..69e5c82 100644
--- a/file.te
+++ b/file.te
@@ -55,6 +55,7 @@ type wifi_data_file, file_type, data_file_type;
type radio_data_file, file_type, data_file_type;
type nfc_data_file, file_type, data_file_type;
type camera_calibration_file, file_type, data_file_type;
+type adb_keys_file, file_type, data_file_type;
# /data/data subdirectories - app sandboxes
type app_data_file, file_type, data_file_type;
type platform_app_data_file, file_type, data_file_type, mlstrustedobject;
diff --git a/file_contexts b/file_contexts
index 81b9da9..d3e53ad 100644
--- a/file_contexts
+++ b/file_contexts
@@ -3,7 +3,7 @@
/ u:object_r:rootfs:s0
# Data files
-/adb_keys u:object_r:rootfs:s0
+/adb_keys u:object_r:adb_keys_file:s0
/default.prop u:object_r:rootfs:s0
/fstab\..* u:object_r:rootfs:s0
/init\..* u:object_r:rootfs:s0
@@ -185,6 +185,7 @@
/data/misc/wifi(/.*)? u:object_r:wifi_data_file:s0
/data/misc/camera(/.*)? u:object_r:camera_calibration_file:s0
/data/misc/dhcp(/.*)? u:object_r:dhcp_data_file:s0
+/data/misc/adb(/.*)? u:object_r:adb_keys_file:s0
# App sandboxes
/data/data/.* u:object_r:app_data_file:s0
# Wallpaper file.