Merge "Allow zoned device support in f2fs" am: a98ea3d8cf am: 32d64b7b82

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/2103273

Change-Id: I0d7e16bacdf9406d4fe1cb15b71875c8f774aefc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-05-25 02:05:23 +00:00 committed by Automerger Merge Worker
commit 8e6f91863f
4 changed files with 5 additions and 2 deletions

View file

@ -9,7 +9,7 @@ allow e2fs userdata_block_device:blk_file rw_file_perms;
allow e2fs metadata_block_device:blk_file rw_file_perms;
allow e2fs dm_device:blk_file rw_file_perms;
allowxperm e2fs { userdata_block_device metadata_block_device dm_device }:blk_file ioctl {
BLKSECDISCARD BLKDISCARD BLKPBSZGET BLKDISCARDZEROES BLKROGET
BLKSECDISCARD BLKDISCARD BLKPBSZGET BLKDISCARDZEROES BLKROGET BLKREPORTZONE BLKRESETZONE
};
allow e2fs {

View file

@ -32,6 +32,7 @@ allow fsck mirror_data_file:dir search;
allowxperm fsck dev_type:blk_file ioctl {
BLKDISCARDZEROES
BLKROGET
BLKREPORTZONE
};
# To determine if it is safe to run fsck on a filesystem, e2fsck

View file

@ -166,6 +166,8 @@ define(`BLKPBSZGET', `0x0000127b')
define(`BLKPG', `0x00001269')
define(`BLKRAGET', `0x00001263')
define(`BLKRASET', `0x00001262')
define(`BLKREPORTZONE', `0xc0101282')
define(`BLKRESETZONE', `0x40101283')
define(`BLKROGET', `0x0000125e')
define(`BLKROSET', `0x0000125d')
define(`BLKROTATIONAL', `0x0000127e')

View file

@ -156,7 +156,7 @@ allow vold vold_device:blk_file { create setattr unlink rw_file_perms };
allowxperm vold vold_device:blk_file ioctl { BLKDISCARD BLKGETSIZE };
allow vold dm_device:chr_file rw_file_perms;
allow vold dm_device:blk_file rw_file_perms;
allowxperm vold dm_device:blk_file ioctl { BLKDISCARD BLKSECDISCARD };
allowxperm vold dm_device:blk_file ioctl { BLKDISCARD BLKSECDISCARD BLKREPORTZONE BLKRESETZONE };
# For vold Process::killProcessesWithOpenFiles function.
allow vold domain:dir r_dir_perms;
allow vold domain:{ file lnk_file } r_file_perms;