diff --git a/private/adbd.te b/private/adbd.te index d28b836f14ad69343f208b5191577ebbe4696874..47a6cbd8cf701a04032f8236fa3dc8f7364e43d6 100644 --- a/private/adbd.te +++ b/private/adbd.te @@ -65,9 +65,14 @@ get_prop(adbd, serialno_prop) # Run /system/bin/bu allow adbd system_file:file rx_file_perms; -# Use screencap -domain_auto_trans(adbd, screencap_exec, screencap) -allow adbd screencap:process signal; +# Perform binder IPC to surfaceflinger (screencap) +# XXX Run screencap in a separate domain? +binder_use(adbd) +binder_call(adbd, surfaceflinger) +# b/13188914 +allow adbd gpu_device:chr_file rw_file_perms; +allow adbd ion_device:chr_file rw_file_perms; +r_dir_file(adbd, system_file) # Needed for various screenshots hal_client_domain(adbd, hal_graphics_allocator) @@ -134,5 +139,5 @@ allow adbd rootfs:dir r_dir_perms; # No transitions from adbd to non-shell, non-crash_dump domains. adbd only ever # transitions to the shell domain (except when it crashes). In particular, we # never want to see a transition from adbd to su (aka "adb root") -neverallow adbd { domain -crash_dump -shell -screencap }:process transition; +neverallow adbd { domain -crash_dump -shell }:process transition; neverallow adbd { domain userdebug_or_eng(`-su') }:process dyntransition; diff --git a/private/app.te b/private/app.te index 8cd959f1377eede2e6908b759ffc54378af9db42..00ee12a6d663a3fb1977ea7e38d45e3bacdd2f8a 100644 --- a/private/app.te +++ b/private/app.te @@ -411,9 +411,7 @@ neverallow { appdomain -shell } { domain -appdomain }:file no_rw_file_perms; # sigchld allowed for parent death notification. # signull allowed for kill(pid, 0) existence test. # All others prohibited. -neverallow { appdomain -shell } { domain -appdomain }:process - { sigkill sigstop signal }; -neverallow shell { domain -appdomain -screencap }:process +neverallow appdomain { domain -appdomain }:process { sigkill sigstop signal }; # Transition to a non-app domain. diff --git a/private/dumpstate.te b/private/dumpstate.te index 8f003aab2b7695d8d56600665a288a961d4b1353..b8f81526cddc1f713b42a4f2e83c97882c1d82dd 100644 --- a/private/dumpstate.te +++ b/private/dumpstate.te @@ -23,7 +23,3 @@ binder_call(dumpstate, storaged) # Collect metrics on boot time created by init get_prop(dumpstate, boottime_prop) - -# Use screencap -domain_auto_trans(dumpstate, screencap_exec, screencap) -allow dumpstate screencap:process signal; diff --git a/private/file_contexts b/private/file_contexts index 4b9d0de88d7a74d1e6b981ed4fd532ff1123b9d5..d35d47dda013ec34cc7d7c3718f68850fa1eb897 100644 --- a/private/file_contexts +++ b/private/file_contexts @@ -210,7 +210,6 @@ /system/bin/mediametrics u:object_r:mediametrics_exec:s0 /system/bin/cameraserver u:object_r:cameraserver_exec:s0 /system/bin/mediaextractor u:object_r:mediaextractor_exec:s0 -/system/bin/screencap u:object_r:screencap_exec:s0 /system/bin/mdnsd u:object_r:mdnsd_exec:s0 /system/bin/installd u:object_r:installd_exec:s0 /system/bin/otapreopt_chroot u:object_r:otapreopt_chroot_exec:s0 diff --git a/private/screencap.te b/private/screencap.te deleted file mode 100644 index 579373aa6a3b41a20edfa24d477c3723bbcf9c9d..0000000000000000000000000000000000000000 --- a/private/screencap.te +++ /dev/null @@ -1,26 +0,0 @@ -type screencap, domain; -type screencap_exec, exec_type, file_type; - -typeattribute screencap coredomain; - -allow screencap gpu_device:chr_file rw_file_perms; -allow screencap ion_device:chr_file rw_file_perms; - -allow screencap adbd:fifo_file write; -allow screencap adbd:fd use; -allow screencap adbd:unix_stream_socket { read write }; - -allow screencap shell_data_file:file write; -allow screencap shell:fd use; -allow screencap shell:unix_stream_socket { read write }; - -allow screencap dumpstate:fd use; -allow screencap dumpstate:unix_stream_socket { read write }; - -binder_use(screencap) -binder_call(screencap, surfaceflinger) -allow screencap surfaceflinger_service:service_manager find; -allow screencap surfaceflinger:fd use; - -hwbinder_use(screencap) -hal_client_domain(screencap, hal_graphics_allocator) diff --git a/private/shell.te b/private/shell.te index 13a20e2b222239321c984de3b6c249cb5917e192..088682015e234534d14c7fc40bc0b362eb66136d 100644 --- a/private/shell.te +++ b/private/shell.te @@ -27,7 +27,3 @@ binder_call(shell, storaged) # Perform SELinux access checks, needed for CTS selinux_check_access(shell) selinux_check_context(shell) - -# Use screencap -domain_auto_trans(shell, screencap_exec, screencap) -allow shell screencap:process signal; diff --git a/private/surfaceflinger.te b/private/surfaceflinger.te index 347a4780c6a76e6530dd66c4b716f89cc309640d..3595ee426c67b0923bff62f5ba8a4024aa77fbae 100644 --- a/private/surfaceflinger.te +++ b/private/surfaceflinger.te @@ -22,7 +22,6 @@ binder_use(surfaceflinger) binder_call(surfaceflinger, binderservicedomain) binder_call(surfaceflinger, appdomain) binder_call(surfaceflinger, bootanim) -binder_call(surfaceflinger, screencap) binder_service(surfaceflinger) # Binder IPC to bu, presently runs in adbd domain. diff --git a/public/dumpstate.te b/public/dumpstate.te index 452f373f00fb9f712b9d9a7c08f607e1a87ad06e..42d744d43a9e3ad391ab17f89af8dc088b4109d5 100644 --- a/public/dumpstate.te +++ b/public/dumpstate.te @@ -141,6 +141,9 @@ allow dumpstate bluetooth_data_file:dir search; allow dumpstate bluetooth_logs_data_file:dir r_dir_perms; allow dumpstate bluetooth_logs_data_file:file r_file_perms; +# Dumpstate calls screencap, which grabs a screenshot. Needs gpu access +allow dumpstate gpu_device:chr_file rw_file_perms; + # logd access read_logd(dumpstate) control_logd(dumpstate)