From 6dc0391fab5ed308091f14a8d4fb9d8e2e02cbd3 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Wed, 18 Aug 2021 12:34:29 +0800 Subject: [PATCH] reuse gs101 pktrouter Bug: 196916111 Test: boot with pktrouter launched Change-Id: Ie901adcba877aa11fcae188e360538c38184db00 --- legacy/device.te | 1 - legacy/file_contexts | 4 ---- legacy/netutils_wrapper.te | 7 ------- legacy/pktrouter.te | 13 ------------- legacy/property.te | 1 - legacy/property_contexts | 4 ---- legacy/vendor_init.te | 1 - 7 files changed, 31 deletions(-) delete mode 100644 legacy/netutils_wrapper.te delete mode 100644 legacy/pktrouter.te diff --git a/legacy/device.te b/legacy/device.te index 039c242b..fa0bb724 100644 --- a/legacy/device.te +++ b/legacy/device.te @@ -12,7 +12,6 @@ type vendor_m2m1shot_device, dev_type; type vendor_gnss_device, dev_type; type vendor_nanohub_device, dev_type; type vendor_secmem_device, dev_type; -type pktrouter_device, dev_type; type vendor_toe_device, dev_type; type custom_ab_block_device, dev_type; type devinfo_block_device, dev_type; diff --git a/legacy/file_contexts b/legacy/file_contexts index 9e502339..4c70a385 100644 --- a/legacy/file_contexts +++ b/legacy/file_contexts @@ -110,7 +110,6 @@ # GPU device /dev/mali0 u:object_r:gpu_device:s0 /dev/s5p-smem u:object_r:vendor_secmem_device:s0 -/dev/umts_wfc[01] u:object_r:pktrouter_device:s0 # # Exynos Daemon Exec @@ -125,9 +124,6 @@ /(vendor|system/vendor)/bin/vcd u:object_r:vcd_exec:s0 /(vendor|system/vendor)/bin/bipchmgr u:object_r:bipchmgr_exec:s0 -# WFC -/(vendor|system/vendor)/bin/wfc-pkt-router u:object_r:pktrouter_exec:s0 - # # Exynos Data Files # diff --git a/legacy/netutils_wrapper.te b/legacy/netutils_wrapper.te deleted file mode 100644 index ff1be58e..00000000 --- a/legacy/netutils_wrapper.te +++ /dev/null @@ -1,7 +0,0 @@ -allow netutils_wrapper pktrouter:fd use; -allow netutils_wrapper pktrouter:fifo_file write; -allow netutils_wrapper pktrouter:netlink_route_socket { read write }; -allow netutils_wrapper pktrouter:packet_socket { read write }; -allow netutils_wrapper pktrouter:rawip_socket { read write }; -allow netutils_wrapper pktrouter:udp_socket { read write }; -allow netutils_wrapper pktrouter_device:chr_file rw_file_perms; diff --git a/legacy/pktrouter.te b/legacy/pktrouter.te deleted file mode 100644 index e06c8db6..00000000 --- a/legacy/pktrouter.te +++ /dev/null @@ -1,13 +0,0 @@ -type pktrouter, domain; -type pktrouter_exec, vendor_file_type, exec_type, file_type; -init_daemon_domain(pktrouter) -net_domain(pktrouter) - -domain_auto_trans(pktrouter, netutils_wrapper_exec, netutils_wrapper); - -allow pktrouter pktrouter_device:chr_file rw_file_perms; -allow pktrouter self:netlink_route_socket nlmsg_write; -allow pktrouter self:packet_socket { bind create read write getattr shutdown}; -allow pktrouter self:capability net_raw; - -get_prop(pktrouter, vendor_ims_prop); diff --git a/legacy/property.te b/legacy/property.te index f9d639b7..80976174 100644 --- a/legacy/property.te +++ b/legacy/property.te @@ -1,6 +1,5 @@ # For Exynos Properties vendor_internal_prop(vendor_prop) -vendor_internal_prop(vendor_ims_prop) vendor_internal_prop(sensors_prop) vendor_internal_prop(vendor_ssrdump_prop) vendor_internal_prop(vendor_device_prop) diff --git a/legacy/property_contexts b/legacy/property_contexts index 1b30aea4..8db6f7d7 100644 --- a/legacy/property_contexts +++ b/legacy/property_contexts @@ -1,7 +1,3 @@ -# for ims service -vendor.charon. u:object_r:vendor_ims_prop:s0 -vendor.pktrouter u:object_r:vendor_ims_prop:s0 - # Ramdump persist.vendor.sys.crash_rcu u:object_r:vendor_ramdump_prop:s0 diff --git a/legacy/vendor_init.te b/legacy/vendor_init.te index 2759e77c..8ac90b4c 100644 --- a/legacy/vendor_init.te +++ b/legacy/vendor_init.te @@ -5,7 +5,6 @@ set_prop(vendor_init, vendor_rild_prop) set_prop(vendor_init, vendor_usb_config_prop) set_prop(vendor_init, vendor_slog_prop) set_prop(vendor_init, vendor_sys_default_prop) -set_prop(vendor_init, vendor_ims_prop) set_prop(vendor_init, vendor_ssrdump_prop) set_prop(vendor_init, vendor_ro_config_default_prop) get_prop(vendor_init, vendor_touchpanel_prop)