From 7ac349e932b66130d7351bd05fb462362f4d8eac Mon Sep 17 00:00:00 2001 From: Ray Chi Date: Tue, 1 Mar 2022 21:54:40 +0800 Subject: [PATCH 1/2] Allow hal_usb_gadget_impl to access proc_irq Bug: 224699556 Test: build pass Change-Id: Id9a9adbdc921629b6e89d0850dd8acaf76b1a891 Merged-In: Id9a9adbdc921629b6e89d0850dd8acaf76b1a891 (cherry picked from commit 455c3c165348fa9ea65c65b004d4dda1426d04be) --- whitechapel/vendor/google/hal_usb_gadget_impl.te | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/whitechapel/vendor/google/hal_usb_gadget_impl.te b/whitechapel/vendor/google/hal_usb_gadget_impl.te index 5170a8ae..7eb0f632 100644 --- a/whitechapel/vendor/google/hal_usb_gadget_impl.te +++ b/whitechapel/vendor/google/hal_usb_gadget_impl.te @@ -12,3 +12,10 @@ set_prop(hal_usb_gadget_impl, vendor_usb_config_prop) allow hal_usb_gadget_impl sysfs_batteryinfo:dir r_dir_perms; allow hal_usb_gadget_impl sysfs_batteryinfo:file rw_file_perms; allow hal_usb_gadget_impl sysfs_extcon:dir search; + +# parser the number of dwc3 irq +allow hal_usb_gadget_impl proc_interrupts:file r_file_perms; + +# change irq to other cores +allow hal_usb_gadget_impl proc_irq:dir r_dir_perms; +allow hal_usb_gadget_impl proc_irq:file w_file_perms; From 503fa0901031f42b064be9c3daf0827868a91b9e Mon Sep 17 00:00:00 2001 From: Ray Chi Date: Wed, 4 May 2022 09:49:17 +0800 Subject: [PATCH 2/2] Revert "add sepolicy for set_usb_irq.sh" This reverts commit 714075eba72067489d08c36b87bfed9656092b2c. Bug: 224699556 Test: build pass Change-Id: Ie275e48ee87c4e9f5c83b7802c3f3baa12ad30af Merged-In: Ie275e48ee87c4e9f5c83b7802c3f3baa12ad30af (cherry picked from commit bf9ec40ab79d9546ecbf7b5c8b8ac0779d8153dc) --- whitechapel/vendor/google/file_contexts | 1 - whitechapel/vendor/google/set-usb-irq-sh.te | 13 ------------- 2 files changed, 14 deletions(-) delete mode 100644 whitechapel/vendor/google/set-usb-irq-sh.te diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts index 05e49591..10ffc7af 100644 --- a/whitechapel/vendor/google/file_contexts +++ b/whitechapel/vendor/google/file_contexts @@ -280,7 +280,6 @@ /vendor/bin/init\.insmod\.sh u:object_r:init-insmod-sh_exec:s0 # USB -/vendor/bin/hw/set_usb_irq\.sh u:object_r:set-usb-irq-sh_exec:s0 /vendor/bin/hw/disable_contaminant_detection\.sh u:object_r:disable-contaminant-detection-sh_exec:s0 # NFC diff --git a/whitechapel/vendor/google/set-usb-irq-sh.te b/whitechapel/vendor/google/set-usb-irq-sh.te deleted file mode 100644 index a00fe3bb..00000000 --- a/whitechapel/vendor/google/set-usb-irq-sh.te +++ /dev/null @@ -1,13 +0,0 @@ -type set-usb-irq-sh, domain; -type set-usb-irq-sh_exec, vendor_file_type, exec_type, file_type; -init_daemon_domain(set-usb-irq-sh) - -allow set-usb-irq-sh vendor_toolbox_exec:file execute_no_trans; - -allow set-usb-irq-sh proc_irq:dir r_dir_perms; -allow set-usb-irq-sh proc_irq:file w_file_perms; - -# AFAICT this happens if /proc/irq updates as we're running -# and we end up trying to write into non-existing file, -# which implies creation... -dontaudit set-usb-irq-sh self:capability dac_override;