diff --git a/private/file_contexts b/private/file_contexts index e0018e364dd3f6bbd9daf27124fba433734089e3..382a20d295bd6eb4744a9843eb0cecec7a4c7e33 100644 --- a/private/file_contexts +++ b/private/file_contexts @@ -225,6 +225,7 @@ /system/lib(64)?/libart.* u:object_r:libart_file:s0 /system/bin/hw/android\.hardware\.audio@2\.0-service u:object_r:hal_audio_exec:s0 /system/bin/hw/android\.hardware\.boot@1\.0-service u:object_r:hal_boot_exec:s0 +/system/bin/hw/android\.hardware\.graphics\.allocator@2\.0-service u:object_r:hal_graphics_allocator_exec:s0 /system/bin/hw/android\.hardware\.light@2\.0-service u:object_r:hal_light_exec:s0 /system/bin/hw/android\.hardware\.memtrack@1\.0-service u:object_r:hal_memtrack_exec:s0 /system/bin/hw/android\.hardware\.nfc@1\.0-service u:object_r:hal_nfc_exec:s0 diff --git a/private/hal_graphics_allocator.te b/private/hal_graphics_allocator.te new file mode 100644 index 0000000000000000000000000000000000000000..d00cf68b470bd7afe81c2a1cd289d16e23bf56a6 --- /dev/null +++ b/private/hal_graphics_allocator.te @@ -0,0 +1 @@ +init_daemon_domain(hal_graphics_allocator) diff --git a/public/app.te b/public/app.te index 985e358ac4ae29322cff132cde6a13ad006b4478..fe9ad52ee59f683bef4f49140d51329449296aee 100644 --- a/public/app.te +++ b/public/app.te @@ -243,6 +243,8 @@ auditallow appdomain ion_device:chr_file { write append }; # TODO audit ion ioctl usage by apps auditallow appdomain ion_device:chr_file ioctl; +allow { appdomain -isolated_app } hal_graphics_allocator:fd use; + # TODO: switch to meminfo service allow appdomain proc_meminfo:file r_file_perms; diff --git a/public/bootanim.te b/public/bootanim.te index abbcacac7694c7f3c83eeaf3cf7f83b900b6d5f1..4d16f551a2f20f3f293408d1b4c0230279ddc89f 100644 --- a/public/bootanim.te +++ b/public/bootanim.te @@ -20,6 +20,7 @@ allow bootanim surfaceflinger_service:service_manager find; # Allow access to ion memory allocation device allow bootanim ion_device:chr_file rw_file_perms; +allow bootanim hal_graphics_allocator:fd use; # Read access to pseudo filesystems. r_dir_file(bootanim, proc) diff --git a/public/cameraserver.te b/public/cameraserver.te index b12d17cc4ee017b3b60286ae33b9e762535fb13f..51f96d748420b0ec33d9c3192a3fe8bbcb866d7d 100644 --- a/public/cameraserver.te +++ b/public/cameraserver.te @@ -15,6 +15,7 @@ allow cameraserver video_device:dir r_dir_perms; allow cameraserver video_device:chr_file rw_file_perms; allow cameraserver camera_device:chr_file rw_file_perms; allow cameraserver ion_device:chr_file rw_file_perms; +allow cameraserver hal_graphics_allocator:fd use; allow cameraserver appops_service:service_manager find; allow cameraserver audioserver_service:service_manager find; diff --git a/public/hal_graphics_allocator.te b/public/hal_graphics_allocator.te new file mode 100644 index 0000000000000000000000000000000000000000..8b33f9325f7252cd0849ed3af3f424511ddc9c18 --- /dev/null +++ b/public/hal_graphics_allocator.te @@ -0,0 +1,10 @@ +# graphics buffer allocator subsystem +type hal_graphics_allocator, domain; +type hal_graphics_allocator_exec, exec_type, file_type; + +# hwbinder access +hwbinder_use(hal_graphics_allocator) + +# GPU device access +allow hal_graphics_allocator gpu_device:chr_file rw_file_perms; +allow hal_graphics_allocator ion_device:chr_file r_file_perms; diff --git a/public/mediacodec.te b/public/mediacodec.te index 0b562c12e3e6fbc88bde79a6078ca6268ca57ed7..a1d90a008b92bbc83a05637bcc976d3106fe2304 100644 --- a/public/mediacodec.te +++ b/public/mediacodec.te @@ -15,6 +15,7 @@ allow mediacodec gpu_device:chr_file rw_file_perms; allow mediacodec video_device:chr_file rw_file_perms; allow mediacodec video_device:dir search; allow mediacodec ion_device:chr_file rw_file_perms; +allow mediacodec hal_graphics_allocator:fd use; ### ### neverallow rules diff --git a/public/mediadrmserver.te b/public/mediadrmserver.te index db8e082f35b39db6c2d6fa5b0fd89c3a0e6ae672..ba4fc9babb9abcd03007aa2f4beb02d282644a70 100644 --- a/public/mediadrmserver.te +++ b/public/mediadrmserver.te @@ -30,6 +30,7 @@ allow mediadrmserver cgroup:file w_file_perms; # Allow access to ion memory allocation device allow mediadrmserver ion_device:chr_file rw_file_perms; +allow mediadrmserver hal_graphics_allocator:fd use; # Allow access to app_data and media_data_files allow mediadrmserver media_data_file:dir create_dir_perms; diff --git a/public/mediaserver.te b/public/mediaserver.te index 94566e0b561297825f9cb18d7f91e20d3736f480..249f63fbea30d01a1315723b218a8212ef20accf 100644 --- a/public/mediaserver.te +++ b/public/mediaserver.te @@ -124,6 +124,8 @@ allow mediaserver media_rw_data_file:file create_file_perms; allow mediaserver preloads_data_file:file { getattr read ioctl }; allow mediaserver ion_device:chr_file r_file_perms; +allow mediaserver hal_graphics_allocator:fd use; + allow mediaserver system_server:fd use; ### diff --git a/public/surfaceflinger.te b/public/surfaceflinger.te index 2afb7d18849e9ad93248c5793b900264f0dcca5e..4f9f8efaf00008dc4b21bbb94d9544a123b6f2a0 100644 --- a/public/surfaceflinger.te +++ b/public/surfaceflinger.te @@ -4,6 +4,10 @@ type surfaceflinger_exec, exec_type, file_type; typeattribute surfaceflinger mlstrustedsubject; +# Perform HwBinder IPC. +hwbinder_use(surfaceflinger) +binder_call(surfaceflinger, hal_graphics_allocator) + # Perform Binder IPC. binder_use(surfaceflinger) binder_call(surfaceflinger, binderservicedomain) diff --git a/public/system_server.te b/public/system_server.te index 7b2b1b91b44acc725db7f08d28c4dbf0e3d36a27..06ec624c1467df23d55fcbc9a4e39878912e7f8a 100644 --- a/public/system_server.te +++ b/public/system_server.te @@ -567,6 +567,7 @@ allow system_server preloads_data_file:dir { r_dir_perms write remove_name rmdir r_dir_file(system_server, cgroup) allow system_server ion_device:chr_file r_file_perms; +allow system_server hal_graphics_allocator:fd use; r_dir_file(system_server, proc) r_dir_file(system_server, proc_meminfo)