Merge "super_block_device -> super_block_device_type"

This commit is contained in:
Yifan Hong 2019-03-28 19:55:44 +00:00 committed by Gerrit Code Review
commit 93b81f30ae
3 changed files with 6 additions and 16 deletions

View file

@ -10,12 +10,8 @@ add_service(lpdumpd, lpdump_service)
# Allow lpdumpd to find the super partition block device. # Allow lpdumpd to find the super partition block device.
allow lpdumpd block_device:dir r_dir_perms; allow lpdumpd block_device:dir r_dir_perms;
# Allow lpdumpd to read super partition metadata. This may live on # Allow lpdumpd to read super partition metadata.
# super_block_device, or system_block_device (on retrofit devices). allow lpdumpd super_block_device_type:blk_file r_file_perms;
allow lpdumpd {
super_block_device
system_block_device
}:blk_file r_file_perms;
# Allow lpdumpd to read fstab. # Allow lpdumpd to read fstab.
allow lpdumpd sysfs_dt_firmware_android:dir r_dir_perms; allow lpdumpd sysfs_dt_firmware_android:dir r_dir_perms;

View file

@ -45,7 +45,7 @@ recovery_only(`
allow fastbootd dm_device:chr_file rw_file_perms; allow fastbootd dm_device:chr_file rw_file_perms;
allow fastbootd dm_device:blk_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 { allow fastbootd {
boot_block_device boot_block_device
metadata_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:dir r_dir_perms;
allow fastbootd gsi_metadata_file:file rw_file_perms; allow fastbootd gsi_metadata_file:file rw_file_perms;
allowxperm fastbootd { allowxperm fastbootd super_block_device_type:blk_file ioctl { BLKIOMIN BLKALIGNOFF };
system_block_device
super_block_device
}:blk_file ioctl { BLKIOMIN BLKALIGNOFF };
allowxperm fastbootd { allowxperm fastbootd {
metadata_block_device metadata_block_device

View file

@ -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; allow update_engine_common dm_device:blk_file rw_file_perms;
# read / write metadata on super device to resize partitions # 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 # ioctl on super device to get block device alignment and alignment offset
allowxperm update_engine_common { allowxperm update_engine_common super_block_device_type:blk_file ioctl { BLKIOMIN BLKALIGNOFF };
system_block_device
super_block_device
}:blk_file ioctl { BLKIOMIN BLKALIGNOFF };
# get physical block device to map logical partitions on device mapper # get physical block device to map logical partitions on device mapper
allow update_engine_common block_device:dir r_dir_perms; allow update_engine_common block_device:dir r_dir_perms;