Merge "super_block_device -> super_block_device_type" am: 93b81f30ae
am: f0e9c939cc
Change-Id: I3ac061c2bd24a0ab7af067bfcdcb8ca38bb0daca
This commit is contained in:
commit
150f84e06c
3 changed files with 6 additions and 16 deletions
|
@ -10,12 +10,8 @@ add_service(lpdumpd, lpdump_service)
|
|||
# Allow lpdumpd to find the super partition block device.
|
||||
allow lpdumpd block_device:dir r_dir_perms;
|
||||
|
||||
# Allow lpdumpd to read super partition metadata. This may live on
|
||||
# super_block_device, or system_block_device (on retrofit devices).
|
||||
allow lpdumpd {
|
||||
super_block_device
|
||||
system_block_device
|
||||
}:blk_file r_file_perms;
|
||||
# Allow lpdumpd to read super partition metadata.
|
||||
allow lpdumpd super_block_device_type:blk_file r_file_perms;
|
||||
|
||||
# Allow lpdumpd to read fstab.
|
||||
allow lpdumpd sysfs_dt_firmware_android:dir r_dir_perms;
|
||||
|
|
|
@ -45,7 +45,7 @@ recovery_only(`
|
|||
allow fastbootd dm_device:chr_file rw_file_perms;
|
||||
allow fastbootd dm_device:blk_file rw_file_perms;
|
||||
|
||||
allow fastbootd super_block_device:blk_file rw_file_perms;
|
||||
allow fastbootd super_block_device_type:blk_file rw_file_perms;
|
||||
allow fastbootd {
|
||||
boot_block_device
|
||||
metadata_block_device
|
||||
|
@ -60,10 +60,7 @@ recovery_only(`
|
|||
allow fastbootd gsi_metadata_file:dir r_dir_perms;
|
||||
allow fastbootd gsi_metadata_file:file rw_file_perms;
|
||||
|
||||
allowxperm fastbootd {
|
||||
system_block_device
|
||||
super_block_device
|
||||
}:blk_file ioctl { BLKIOMIN BLKALIGNOFF };
|
||||
allowxperm fastbootd super_block_device_type:blk_file ioctl { BLKIOMIN BLKALIGNOFF };
|
||||
|
||||
allowxperm fastbootd {
|
||||
metadata_block_device
|
||||
|
|
|
@ -63,13 +63,10 @@ allow update_engine_common dm_device:chr_file rw_file_perms;
|
|||
allow update_engine_common dm_device:blk_file rw_file_perms;
|
||||
|
||||
# read / write metadata on super device to resize partitions
|
||||
allow update_engine_common super_block_device:blk_file rw_file_perms;
|
||||
allow update_engine_common super_block_device_type:blk_file rw_file_perms;
|
||||
|
||||
# ioctl on super device to get block device alignment and alignment offset
|
||||
allowxperm update_engine_common {
|
||||
system_block_device
|
||||
super_block_device
|
||||
}:blk_file ioctl { BLKIOMIN BLKALIGNOFF };
|
||||
allowxperm update_engine_common super_block_device_type:blk_file ioctl { BLKIOMIN BLKALIGNOFF };
|
||||
|
||||
# get physical block device to map logical partitions on device mapper
|
||||
allow update_engine_common block_device:dir r_dir_perms;
|
||||
|
|
Loading…
Reference in a new issue