Skip to content

Commit faa2181

Browse files
haggertkbgcngm
haggertk
authored and
bgcngm
committed
Allow init to write to /proc/cpu/alignment
* AOSP init.rc attempts to write to /proc/cpu/alignment, but following 84e181b, general access to procfs nodes is prohibited. * Add an appropriate type, genfscon, and allow to permit this action. Change-Id: I31ad8eaa6ebb6dd57d1b9c4395cb22cdd0d7b3d3 (cherry picked from commit 6213f5041a6e9242b2a23c8cc85d0d76cbc1fc45)
1 parent 31f3ea2 commit faa2181

File tree

14 files changed

+14
-0
lines changed

14 files changed

+14
-0
lines changed

‎prebuilts/api/30.0/private/compat/26.0/26.0.ignore.cil

+1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
perfetto_exec
134134
perfetto_tmpfs
135135
perfetto_traces_data_file
136+
proc_cpu_alignment
136137
proc_dt_firmware_android
137138
property_info
138139
recovery_socket

‎prebuilts/api/30.0/private/compat/27.0/27.0.ignore.cil

+1
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
perfetto_exec
121121
perfetto_tmpfs
122122
perfetto_traces_data_file
123+
proc_cpu_alignment
123124
proc_dt_firmware_android
124125
property_info
125126
recovery_socket

‎prebuilts/api/30.0/private/compat/28.0/28.0.ignore.cil

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
password_slot_metadata_file
109109
permissionmgr_service
110110
postinstall_apex_mnt_dir
111+
proc_cpu_alignment
111112
proc_dt_firmware_android
112113
recovery_socket
113114
role_service

‎prebuilts/api/30.0/private/compat/29.0/29.0.ignore.cil

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
ota_metadata_file
8989
ota_prop
9090
prereboot_data_file
91+
proc_cpu_alignment
9192
proc_dt_firmware_android
9293
art_apex_dir
9394
rebootescrow_hal_prop

‎prebuilts/api/30.0/private/genfs_contexts

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ genfscon proc /net/tcp u:object_r:proc_net_tcp_udp:s0
2424
genfscon proc /net/udp u:object_r:proc_net_tcp_udp:s0
2525
genfscon proc /net/xt_qtaguid/ctrl u:object_r:proc_qtaguid_ctrl:s0
2626
genfscon proc /net/xt_qtaguid/ u:object_r:proc_qtaguid_stat:s0
27+
genfscon proc /cpu/alignment u:object_r:proc_cpu_alignment:s0
2728
genfscon proc /cpuinfo u:object_r:proc_cpuinfo:s0
2829
genfscon proc /pagetypeinfo u:object_r:proc_pagetypeinfo:s0
2930
genfscon proc /pressure/cpu u:object_r:proc_pressure_cpu:s0

‎prebuilts/api/30.0/public/file.te

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ type proc_abi, fs_type, proc_type;
2424
type proc_asound, fs_type, proc_type;
2525
type proc_buddyinfo, fs_type, proc_type;
2626
type proc_cmdline, fs_type, proc_type;
27+
type proc_cpu_alignment, fs_type, proc_type;
2728
type proc_cpuinfo, fs_type, proc_type;
2829
type proc_dirty, fs_type, proc_type;
2930
type proc_diskstats, fs_type, proc_type;

‎prebuilts/api/30.0/public/init.te

+1
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ allow init {
351351

352352
allow init {
353353
proc_abi
354+
proc_cpu_alignment
354355
proc_dirty
355356
proc_hostname
356357
proc_hung_task

‎private/compat/26.0/26.0.ignore.cil

+1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
perfetto_exec
134134
perfetto_tmpfs
135135
perfetto_traces_data_file
136+
proc_cpu_alignment
136137
proc_dt_firmware_android
137138
property_info
138139
recovery_socket

‎private/compat/27.0/27.0.ignore.cil

+1
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
perfetto_exec
121121
perfetto_tmpfs
122122
perfetto_traces_data_file
123+
proc_cpu_alignment
123124
proc_dt_firmware_android
124125
property_info
125126
recovery_socket

‎private/compat/28.0/28.0.ignore.cil

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
password_slot_metadata_file
109109
permissionmgr_service
110110
postinstall_apex_mnt_dir
111+
proc_cpu_alignment
111112
proc_dt_firmware_android
112113
recovery_socket
113114
role_service

‎private/compat/29.0/29.0.ignore.cil

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
ota_metadata_file
8989
ota_prop
9090
prereboot_data_file
91+
proc_cpu_alignment
9192
proc_dt_firmware_android
9293
art_apex_dir
9394
rebootescrow_hal_prop

‎private/genfs_contexts

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ genfscon proc /net/tcp u:object_r:proc_net_tcp_udp:s0
2424
genfscon proc /net/udp u:object_r:proc_net_tcp_udp:s0
2525
genfscon proc /net/xt_qtaguid/ctrl u:object_r:proc_qtaguid_ctrl:s0
2626
genfscon proc /net/xt_qtaguid/ u:object_r:proc_qtaguid_stat:s0
27+
genfscon proc /cpu/alignment u:object_r:proc_cpu_alignment:s0
2728
genfscon proc /cpuinfo u:object_r:proc_cpuinfo:s0
2829
genfscon proc /pagetypeinfo u:object_r:proc_pagetypeinfo:s0
2930
genfscon proc /pressure/cpu u:object_r:proc_pressure_cpu:s0

‎public/file.te

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ type proc_abi, fs_type, proc_type;
2424
type proc_asound, fs_type, proc_type;
2525
type proc_buddyinfo, fs_type, proc_type;
2626
type proc_cmdline, fs_type, proc_type;
27+
type proc_cpu_alignment, fs_type, proc_type;
2728
type proc_cpuinfo, fs_type, proc_type;
2829
type proc_dirty, fs_type, proc_type;
2930
type proc_diskstats, fs_type, proc_type;

‎public/init.te

+1
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ allow init {
351351

352352
allow init {
353353
proc_abi
354+
proc_cpu_alignment
354355
proc_dirty
355356
proc_hostname
356357
proc_hung_task

0 commit comments

Comments
 (0)