-
Notifications
You must be signed in to change notification settings - Fork 13
Expand file tree
/
Copy path0002-sepolicy-Treat-proc-based-DT-fstab-the-same-and-sys-.patch
More file actions
505 lines (480 loc) · 19.5 KB
/
Copy path0002-sepolicy-Treat-proc-based-DT-fstab-the-same-and-sys-.patch
File metadata and controls
505 lines (480 loc) · 19.5 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
From f2269957ab0bdd03a5d539d97dde625a577e5133 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Thu, 12 Nov 2020 17:57:16 +0000
Subject: [PATCH 2/3] sepolicy: Treat proc-based DT fstab the same and
sys-based
* Older devices have a DT fstab in proc, so we need to expand our
policy to make this first-class like the fancy, new, sys devices
Change-Id: I3cfed1e8e9fdf8665f1348fa07fa42d4f37873e9
---
prebuilts/api/31.0/private/compat/26.0/26.0.ignore.cil | 1 +
prebuilts/api/31.0/private/compat/27.0/27.0.ignore.cil | 1 +
prebuilts/api/31.0/private/compat/28.0/28.0.ignore.cil | 1 +
prebuilts/api/31.0/private/compat/29.0/29.0.ignore.cil | 1 +
prebuilts/api/31.0/private/compat/30.0/30.0.ignore.cil | 1 +
prebuilts/api/31.0/private/genfs_contexts | 1 +
prebuilts/api/31.0/public/file.te | 1 +
prebuilts/api/31.0/public/init.te | 1 +
prebuilts/api/31.0/public/ueventd.te | 3 +++
prebuilts/api/31.0/public/uncrypt.te | 3 +++
prebuilts/api/31.0/public/update_engine_common.te | 3 +++
prebuilts/api/31.0/public/vold.te | 3 +++
prebuilts/api/32.0/private/compat/26.0/26.0.ignore.cil | 1 +
prebuilts/api/32.0/private/compat/27.0/27.0.ignore.cil | 1 +
prebuilts/api/32.0/private/compat/28.0/28.0.ignore.cil | 1 +
prebuilts/api/32.0/private/compat/29.0/29.0.ignore.cil | 1 +
prebuilts/api/32.0/private/compat/30.0/30.0.ignore.cil | 1 +
prebuilts/api/32.0/private/genfs_contexts | 1 +
prebuilts/api/32.0/public/file.te | 1 +
prebuilts/api/32.0/public/init.te | 1 +
prebuilts/api/32.0/public/ueventd.te | 3 +++
prebuilts/api/32.0/public/uncrypt.te | 3 +++
prebuilts/api/32.0/public/update_engine_common.te | 3 +++
prebuilts/api/32.0/public/vold.te | 3 +++
private/compat/26.0/26.0.ignore.cil | 1 +
private/compat/27.0/27.0.ignore.cil | 1 +
private/compat/28.0/28.0.ignore.cil | 1 +
private/compat/29.0/29.0.ignore.cil | 1 +
private/compat/30.0/30.0.ignore.cil | 1 +
private/genfs_contexts | 1 +
public/file.te | 1 +
public/init.te | 1 +
public/ueventd.te | 3 +++
public/uncrypt.te | 3 +++
public/update_engine_common.te | 3 +++
public/vold.te | 3 +++
36 files changed, 60 insertions(+)
diff --git a/prebuilts/api/31.0/private/compat/26.0/26.0.ignore.cil b/prebuilts/api/31.0/private/compat/26.0/26.0.ignore.cil
index db46f76dd..13ba65c6a 100644
--- a/prebuilts/api/31.0/private/compat/26.0/26.0.ignore.cil
+++ b/prebuilts/api/31.0/private/compat/26.0/26.0.ignore.cil
@@ -136,6 +136,7 @@
perfetto_exec
perfetto_tmpfs
perfetto_traces_data_file
+ proc_dt_firmware_android
property_info
recovery_socket
role_service
diff --git a/prebuilts/api/31.0/private/compat/27.0/27.0.ignore.cil b/prebuilts/api/31.0/private/compat/27.0/27.0.ignore.cil
index dbbe58573..9154be73a 100644
--- a/prebuilts/api/31.0/private/compat/27.0/27.0.ignore.cil
+++ b/prebuilts/api/31.0/private/compat/27.0/27.0.ignore.cil
@@ -151,6 +151,7 @@
perfetto_exec
perfetto_tmpfs
perfetto_traces_data_file
+ proc_dt_firmware_android
property_info
property_service_version_prop
provisioned_prop
diff --git a/prebuilts/api/31.0/private/compat/28.0/28.0.ignore.cil b/prebuilts/api/31.0/private/compat/28.0/28.0.ignore.cil
index fa6204cbd..64c79da80 100644
--- a/prebuilts/api/31.0/private/compat/28.0/28.0.ignore.cil
+++ b/prebuilts/api/31.0/private/compat/28.0/28.0.ignore.cil
@@ -109,6 +109,7 @@
password_slot_metadata_file
permissionmgr_service
postinstall_apex_mnt_dir
+ proc_dt_firmware_android
recovery_socket
role_service
rollback_service
diff --git a/prebuilts/api/31.0/private/compat/29.0/29.0.ignore.cil b/prebuilts/api/31.0/private/compat/29.0/29.0.ignore.cil
index 9c3a1d5bd..803fa9d90 100644
--- a/prebuilts/api/31.0/private/compat/29.0/29.0.ignore.cil
+++ b/prebuilts/api/31.0/private/compat/29.0/29.0.ignore.cil
@@ -88,6 +88,7 @@
ota_metadata_file
ota_prop
prereboot_data_file
+ proc_dt_firmware_android
art_apex_dir
rebootescrow_hal_prop
securityfs
diff --git a/prebuilts/api/31.0/private/compat/30.0/30.0.ignore.cil b/prebuilts/api/31.0/private/compat/30.0/30.0.ignore.cil
index 8a579b18e..1f17024e8 100644
--- a/prebuilts/api/31.0/private/compat/30.0/30.0.ignore.cil
+++ b/prebuilts/api/31.0/private/compat/30.0/30.0.ignore.cil
@@ -102,6 +102,7 @@
postinstall_vendor_mnt_dir
power_debug_prop
powerstats_service
+ proc_dt_firmware_android
proc_kallsyms
proc_locks
profcollectd
diff --git a/prebuilts/api/31.0/private/genfs_contexts b/prebuilts/api/31.0/private/genfs_contexts
index 13bfb46e1..733710e31 100644
--- a/prebuilts/api/31.0/private/genfs_contexts
+++ b/prebuilts/api/31.0/private/genfs_contexts
@@ -8,6 +8,7 @@ genfscon proc /buddyinfo u:object_r:proc_buddyinfo:s0
genfscon proc /cmdline u:object_r:proc_cmdline:s0
genfscon proc /config.gz u:object_r:config_gz:s0
genfscon proc /diskstats u:object_r:proc_diskstats:s0
+genfscon proc /device-tree/firmware/android u:object_r:proc_dt_firmware_android:s0
genfscon proc /filesystems u:object_r:proc_filesystems:s0
genfscon proc /interrupts u:object_r:proc_interrupts:s0
genfscon proc /iomem u:object_r:proc_iomem:s0
diff --git a/prebuilts/api/31.0/public/file.te b/prebuilts/api/31.0/public/file.te
index 578df89b6..134b3f1f1 100644
--- a/prebuilts/api/31.0/public/file.te
+++ b/prebuilts/api/31.0/public/file.te
@@ -28,6 +28,7 @@ type proc_cmdline, fs_type, proc_type;
type proc_cpuinfo, fs_type, proc_type;
type proc_dirty, fs_type, proc_type;
type proc_diskstats, fs_type, proc_type;
+type proc_dt_firmware_android, fs_type, proc_type;
type proc_extra_free_kbytes, fs_type, proc_type;
type proc_filesystems, fs_type, proc_type;
type proc_fs_verity, fs_type, proc_type;
diff --git a/prebuilts/api/31.0/public/init.te b/prebuilts/api/31.0/public/init.te
index ea5a9793d..31bff7487 100644
--- a/prebuilts/api/31.0/public/init.te
+++ b/prebuilts/api/31.0/public/init.te
@@ -414,6 +414,7 @@ allow init {
}:file w_file_perms;
allow init {
+ proc_dt_firmware_android
sysfs_dt_firmware_android
sysfs_fs_ext4_features
}:file r_file_perms;
diff --git a/prebuilts/api/31.0/public/ueventd.te b/prebuilts/api/31.0/public/ueventd.te
index d5d43017d..404b8cf7a 100644
--- a/prebuilts/api/31.0/public/ueventd.te
+++ b/prebuilts/api/31.0/public/ueventd.te
@@ -25,6 +25,9 @@ allow ueventd self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
allow ueventd efs_file:dir search;
allow ueventd efs_file:file r_file_perms;
+# Read the legacy DT fstab
+r_dir_file(ueventd, proc_dt_firmware_android)
+
# Get SELinux enforcing status.
r_dir_file(ueventd, selinuxfs)
diff --git a/prebuilts/api/31.0/public/uncrypt.te b/prebuilts/api/31.0/public/uncrypt.te
index 3b04671b2..f78a0241c 100644
--- a/prebuilts/api/31.0/public/uncrypt.te
+++ b/prebuilts/api/31.0/public/uncrypt.te
@@ -42,5 +42,8 @@ allow uncrypt {
# Read files in /sys
r_dir_file(uncrypt, sysfs_dt_firmware_android)
+# Read files in /proc
+r_dir_file(uncrypt, proc_dt_firmware_android)
+
# Allow ReadDefaultFstab().
read_fstab(uncrypt)
diff --git a/prebuilts/api/31.0/public/update_engine_common.te b/prebuilts/api/31.0/public/update_engine_common.te
index e8fd29e41..85e975278 100644
--- a/prebuilts/api/31.0/public/update_engine_common.te
+++ b/prebuilts/api/31.0/public/update_engine_common.te
@@ -56,6 +56,9 @@ allow update_engine_common proc_cmdline:file r_file_perms;
# Read files in /sys/firmware/devicetree/base/firmware/android/
r_dir_file(update_engine_common, sysfs_dt_firmware_android)
+# Read files in /proc/device-tree/firmware/android
+r_dir_file(update_engine_common, proc_dt_firmware_android)
+
# Needed because libdm reads sysfs to validate when a dm path is ready.
r_dir_file(update_engine_common, sysfs_dm)
diff --git a/prebuilts/api/31.0/public/vold.te b/prebuilts/api/31.0/public/vold.te
index 7796ba851..09f16d521 100644
--- a/prebuilts/api/31.0/public/vold.te
+++ b/prebuilts/api/31.0/public/vold.te
@@ -19,6 +19,9 @@ allow vold {
sysfs_fs_f2fs
}:file w_file_perms;
+# Read the legacy DT fstab
+r_dir_file(vold, proc_dt_firmware_android)
+
r_dir_file(vold, rootfs)
r_dir_file(vold, metadata_file)
allow vold {
diff --git a/prebuilts/api/32.0/private/compat/26.0/26.0.ignore.cil b/prebuilts/api/32.0/private/compat/26.0/26.0.ignore.cil
index db46f76dd..13ba65c6a 100644
--- a/prebuilts/api/32.0/private/compat/26.0/26.0.ignore.cil
+++ b/prebuilts/api/32.0/private/compat/26.0/26.0.ignore.cil
@@ -136,6 +136,7 @@
perfetto_exec
perfetto_tmpfs
perfetto_traces_data_file
+ proc_dt_firmware_android
property_info
recovery_socket
role_service
diff --git a/prebuilts/api/32.0/private/compat/27.0/27.0.ignore.cil b/prebuilts/api/32.0/private/compat/27.0/27.0.ignore.cil
index dbbe58573..9154be73a 100644
--- a/prebuilts/api/32.0/private/compat/27.0/27.0.ignore.cil
+++ b/prebuilts/api/32.0/private/compat/27.0/27.0.ignore.cil
@@ -151,6 +151,7 @@
perfetto_exec
perfetto_tmpfs
perfetto_traces_data_file
+ proc_dt_firmware_android
property_info
property_service_version_prop
provisioned_prop
diff --git a/prebuilts/api/32.0/private/compat/28.0/28.0.ignore.cil b/prebuilts/api/32.0/private/compat/28.0/28.0.ignore.cil
index fa6204cbd..64c79da80 100644
--- a/prebuilts/api/32.0/private/compat/28.0/28.0.ignore.cil
+++ b/prebuilts/api/32.0/private/compat/28.0/28.0.ignore.cil
@@ -109,6 +109,7 @@
password_slot_metadata_file
permissionmgr_service
postinstall_apex_mnt_dir
+ proc_dt_firmware_android
recovery_socket
role_service
rollback_service
diff --git a/prebuilts/api/32.0/private/compat/29.0/29.0.ignore.cil b/prebuilts/api/32.0/private/compat/29.0/29.0.ignore.cil
index 9c3a1d5bd..803fa9d90 100644
--- a/prebuilts/api/32.0/private/compat/29.0/29.0.ignore.cil
+++ b/prebuilts/api/32.0/private/compat/29.0/29.0.ignore.cil
@@ -88,6 +88,7 @@
ota_metadata_file
ota_prop
prereboot_data_file
+ proc_dt_firmware_android
art_apex_dir
rebootescrow_hal_prop
securityfs
diff --git a/prebuilts/api/32.0/private/compat/30.0/30.0.ignore.cil b/prebuilts/api/32.0/private/compat/30.0/30.0.ignore.cil
index a9c670ef8..0d08e8c26 100644
--- a/prebuilts/api/32.0/private/compat/30.0/30.0.ignore.cil
+++ b/prebuilts/api/32.0/private/compat/30.0/30.0.ignore.cil
@@ -103,6 +103,7 @@
postinstall_vendor_mnt_dir
power_debug_prop
powerstats_service
+ proc_dt_firmware_android
proc_kallsyms
proc_locks
profcollectd
diff --git a/prebuilts/api/32.0/private/genfs_contexts b/prebuilts/api/32.0/private/genfs_contexts
index 13bfb46e1..733710e31 100644
--- a/prebuilts/api/32.0/private/genfs_contexts
+++ b/prebuilts/api/32.0/private/genfs_contexts
@@ -8,6 +8,7 @@ genfscon proc /buddyinfo u:object_r:proc_buddyinfo:s0
genfscon proc /cmdline u:object_r:proc_cmdline:s0
genfscon proc /config.gz u:object_r:config_gz:s0
genfscon proc /diskstats u:object_r:proc_diskstats:s0
+genfscon proc /device-tree/firmware/android u:object_r:proc_dt_firmware_android:s0
genfscon proc /filesystems u:object_r:proc_filesystems:s0
genfscon proc /interrupts u:object_r:proc_interrupts:s0
genfscon proc /iomem u:object_r:proc_iomem:s0
diff --git a/prebuilts/api/32.0/public/file.te b/prebuilts/api/32.0/public/file.te
index 578df89b6..134b3f1f1 100644
--- a/prebuilts/api/32.0/public/file.te
+++ b/prebuilts/api/32.0/public/file.te
@@ -28,6 +28,7 @@ type proc_cmdline, fs_type, proc_type;
type proc_cpuinfo, fs_type, proc_type;
type proc_dirty, fs_type, proc_type;
type proc_diskstats, fs_type, proc_type;
+type proc_dt_firmware_android, fs_type, proc_type;
type proc_extra_free_kbytes, fs_type, proc_type;
type proc_filesystems, fs_type, proc_type;
type proc_fs_verity, fs_type, proc_type;
diff --git a/prebuilts/api/32.0/public/init.te b/prebuilts/api/32.0/public/init.te
index ea5a9793d..31bff7487 100644
--- a/prebuilts/api/32.0/public/init.te
+++ b/prebuilts/api/32.0/public/init.te
@@ -414,6 +414,7 @@ allow init {
}:file w_file_perms;
allow init {
+ proc_dt_firmware_android
sysfs_dt_firmware_android
sysfs_fs_ext4_features
}:file r_file_perms;
diff --git a/prebuilts/api/32.0/public/ueventd.te b/prebuilts/api/32.0/public/ueventd.te
index d5d43017d..404b8cf7a 100644
--- a/prebuilts/api/32.0/public/ueventd.te
+++ b/prebuilts/api/32.0/public/ueventd.te
@@ -25,6 +25,9 @@ allow ueventd self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
allow ueventd efs_file:dir search;
allow ueventd efs_file:file r_file_perms;
+# Read the legacy DT fstab
+r_dir_file(ueventd, proc_dt_firmware_android)
+
# Get SELinux enforcing status.
r_dir_file(ueventd, selinuxfs)
diff --git a/prebuilts/api/32.0/public/uncrypt.te b/prebuilts/api/32.0/public/uncrypt.te
index 3b04671b2..f78a0241c 100644
--- a/prebuilts/api/32.0/public/uncrypt.te
+++ b/prebuilts/api/32.0/public/uncrypt.te
@@ -42,5 +42,8 @@ allow uncrypt {
# Read files in /sys
r_dir_file(uncrypt, sysfs_dt_firmware_android)
+# Read files in /proc
+r_dir_file(uncrypt, proc_dt_firmware_android)
+
# Allow ReadDefaultFstab().
read_fstab(uncrypt)
diff --git a/prebuilts/api/32.0/public/update_engine_common.te b/prebuilts/api/32.0/public/update_engine_common.te
index e8fd29e41..85e975278 100644
--- a/prebuilts/api/32.0/public/update_engine_common.te
+++ b/prebuilts/api/32.0/public/update_engine_common.te
@@ -56,6 +56,9 @@ allow update_engine_common proc_cmdline:file r_file_perms;
# Read files in /sys/firmware/devicetree/base/firmware/android/
r_dir_file(update_engine_common, sysfs_dt_firmware_android)
+# Read files in /proc/device-tree/firmware/android
+r_dir_file(update_engine_common, proc_dt_firmware_android)
+
# Needed because libdm reads sysfs to validate when a dm path is ready.
r_dir_file(update_engine_common, sysfs_dm)
diff --git a/prebuilts/api/32.0/public/vold.te b/prebuilts/api/32.0/public/vold.te
index 7796ba851..09f16d521 100644
--- a/prebuilts/api/32.0/public/vold.te
+++ b/prebuilts/api/32.0/public/vold.te
@@ -19,6 +19,9 @@ allow vold {
sysfs_fs_f2fs
}:file w_file_perms;
+# Read the legacy DT fstab
+r_dir_file(vold, proc_dt_firmware_android)
+
r_dir_file(vold, rootfs)
r_dir_file(vold, metadata_file)
allow vold {
diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index db46f76dd..13ba65c6a 100644
--- a/private/compat/26.0/26.0.ignore.cil
+++ b/private/compat/26.0/26.0.ignore.cil
@@ -136,6 +136,7 @@
perfetto_exec
perfetto_tmpfs
perfetto_traces_data_file
+ proc_dt_firmware_android
property_info
recovery_socket
role_service
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index dbbe58573..9154be73a 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -151,6 +151,7 @@
perfetto_exec
perfetto_tmpfs
perfetto_traces_data_file
+ proc_dt_firmware_android
property_info
property_service_version_prop
provisioned_prop
diff --git a/private/compat/28.0/28.0.ignore.cil b/private/compat/28.0/28.0.ignore.cil
index fa6204cbd..64c79da80 100644
--- a/private/compat/28.0/28.0.ignore.cil
+++ b/private/compat/28.0/28.0.ignore.cil
@@ -109,6 +109,7 @@
password_slot_metadata_file
permissionmgr_service
postinstall_apex_mnt_dir
+ proc_dt_firmware_android
recovery_socket
role_service
rollback_service
diff --git a/private/compat/29.0/29.0.ignore.cil b/private/compat/29.0/29.0.ignore.cil
index 9c3a1d5bd..803fa9d90 100644
--- a/private/compat/29.0/29.0.ignore.cil
+++ b/private/compat/29.0/29.0.ignore.cil
@@ -88,6 +88,7 @@
ota_metadata_file
ota_prop
prereboot_data_file
+ proc_dt_firmware_android
art_apex_dir
rebootescrow_hal_prop
securityfs
diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil
index a9c670ef8..0d08e8c26 100644
--- a/private/compat/30.0/30.0.ignore.cil
+++ b/private/compat/30.0/30.0.ignore.cil
@@ -103,6 +103,7 @@
postinstall_vendor_mnt_dir
power_debug_prop
powerstats_service
+ proc_dt_firmware_android
proc_kallsyms
proc_locks
profcollectd
diff --git a/private/genfs_contexts b/private/genfs_contexts
index 13bfb46e1..733710e31 100644
--- a/private/genfs_contexts
+++ b/private/genfs_contexts
@@ -8,6 +8,7 @@ genfscon proc /buddyinfo u:object_r:proc_buddyinfo:s0
genfscon proc /cmdline u:object_r:proc_cmdline:s0
genfscon proc /config.gz u:object_r:config_gz:s0
genfscon proc /diskstats u:object_r:proc_diskstats:s0
+genfscon proc /device-tree/firmware/android u:object_r:proc_dt_firmware_android:s0
genfscon proc /filesystems u:object_r:proc_filesystems:s0
genfscon proc /interrupts u:object_r:proc_interrupts:s0
genfscon proc /iomem u:object_r:proc_iomem:s0
diff --git a/public/file.te b/public/file.te
index 578df89b6..134b3f1f1 100644
--- a/public/file.te
+++ b/public/file.te
@@ -28,6 +28,7 @@ type proc_cmdline, fs_type, proc_type;
type proc_cpuinfo, fs_type, proc_type;
type proc_dirty, fs_type, proc_type;
type proc_diskstats, fs_type, proc_type;
+type proc_dt_firmware_android, fs_type, proc_type;
type proc_extra_free_kbytes, fs_type, proc_type;
type proc_filesystems, fs_type, proc_type;
type proc_fs_verity, fs_type, proc_type;
diff --git a/public/init.te b/public/init.te
index ea5a9793d..31bff7487 100644
--- a/public/init.te
+++ b/public/init.te
@@ -414,6 +414,7 @@ allow init {
}:file w_file_perms;
allow init {
+ proc_dt_firmware_android
sysfs_dt_firmware_android
sysfs_fs_ext4_features
}:file r_file_perms;
diff --git a/public/ueventd.te b/public/ueventd.te
index d5d43017d..404b8cf7a 100644
--- a/public/ueventd.te
+++ b/public/ueventd.te
@@ -25,6 +25,9 @@ allow ueventd self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
allow ueventd efs_file:dir search;
allow ueventd efs_file:file r_file_perms;
+# Read the legacy DT fstab
+r_dir_file(ueventd, proc_dt_firmware_android)
+
# Get SELinux enforcing status.
r_dir_file(ueventd, selinuxfs)
diff --git a/public/uncrypt.te b/public/uncrypt.te
index 3b04671b2..f78a0241c 100644
--- a/public/uncrypt.te
+++ b/public/uncrypt.te
@@ -42,5 +42,8 @@ allow uncrypt {
# Read files in /sys
r_dir_file(uncrypt, sysfs_dt_firmware_android)
+# Read files in /proc
+r_dir_file(uncrypt, proc_dt_firmware_android)
+
# Allow ReadDefaultFstab().
read_fstab(uncrypt)
diff --git a/public/update_engine_common.te b/public/update_engine_common.te
index e8fd29e41..85e975278 100644
--- a/public/update_engine_common.te
+++ b/public/update_engine_common.te
@@ -56,6 +56,9 @@ allow update_engine_common proc_cmdline:file r_file_perms;
# Read files in /sys/firmware/devicetree/base/firmware/android/
r_dir_file(update_engine_common, sysfs_dt_firmware_android)
+# Read files in /proc/device-tree/firmware/android
+r_dir_file(update_engine_common, proc_dt_firmware_android)
+
# Needed because libdm reads sysfs to validate when a dm path is ready.
r_dir_file(update_engine_common, sysfs_dm)
diff --git a/public/vold.te b/public/vold.te
index 7796ba851..09f16d521 100644
--- a/public/vold.te
+++ b/public/vold.te
@@ -19,6 +19,9 @@ allow vold {
sysfs_fs_f2fs
}:file w_file_perms;
+# Read the legacy DT fstab
+r_dir_file(vold, proc_dt_firmware_android)
+
r_dir_file(vold, rootfs)
r_dir_file(vold, metadata_file)
allow vold {
--
2.35.1