From 5134bb20942122b9b34c63bed4bcf4eb5c86ba6f Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Wed, 29 Dec 2021 15:16:04 -0800 Subject: [PATCH] Revert converting ext4 to f2fs Revert the below commits: commit bf900e2ae578 "allow to convert /efs to f2fs" commit 54b0addb16bc "convert_to_f2fs.sh: add sepolicy" And, tracking_denials WA. Bug: 207031989 Signed-off-by: Jaegeuk Kim Change-Id: Id3dd1c5b8cad962845fd7a88b9069315819e5f3d --- tracking_denials/convert-to-f2fs-sh.te | 16 ---------------- whitechapel_pro/convert-to-f2fs-sh.te | 11 ----------- whitechapel_pro/file_contexts | 1 - 3 files changed, 28 deletions(-) delete mode 100644 tracking_denials/convert-to-f2fs-sh.te delete mode 100644 whitechapel_pro/convert-to-f2fs-sh.te diff --git a/tracking_denials/convert-to-f2fs-sh.te b/tracking_denials/convert-to-f2fs-sh.te deleted file mode 100644 index 6231c945..00000000 --- a/tracking_denials/convert-to-f2fs-sh.te +++ /dev/null @@ -1,16 +0,0 @@ -# b/205657040 -dontaudit convert-to-f2fs-sh kmsg_device:chr_file { open }; -dontaudit convert-to-f2fs-sh kmsg_device:chr_file { write }; -dontaudit convert-to-f2fs-sh modem_userdata_block_device:blk_file { open }; -dontaudit convert-to-f2fs-sh modem_userdata_block_device:blk_file { read }; -# b/205779877 -dontaudit convert-to-f2fs-sh shell_exec:file { execute }; -dontaudit convert-to-f2fs-sh shell_exec:file { getattr }; -dontaudit convert-to-f2fs-sh shell_exec:file { map }; -dontaudit convert-to-f2fs-sh shell_exec:file { read }; -dontaudit convert-to-f2fs-sh toolbox_exec:file { execute }; -dontaudit convert-to-f2fs-sh toolbox_exec:file { execute_no_trans }; -dontaudit convert-to-f2fs-sh toolbox_exec:file { getattr }; -dontaudit convert-to-f2fs-sh toolbox_exec:file { read open }; -# b/205904438 -dontaudit convert-to-f2fs-sh toolbox_exec:file { map }; diff --git a/whitechapel_pro/convert-to-f2fs-sh.te b/whitechapel_pro/convert-to-f2fs-sh.te deleted file mode 100644 index 15d983be..00000000 --- a/whitechapel_pro/convert-to-f2fs-sh.te +++ /dev/null @@ -1,11 +0,0 @@ -type convert-to-f2fs-sh, domain; - -type convert-to-f2fs-sh_exec, vendor_file_type, exec_type, file_type; - -init_daemon_domain(convert-to-f2fs-sh) - -allow convert-to-f2fs-sh vendor_file:file execute_no_trans; -allow convert-to-f2fs-sh persist_block_device:blk_file r_file_perms; -allow convert-to-f2fs-sh efs_block_device:blk_file r_file_perms; -allow convert-to-f2fs-sh block_device:dir search; -allow convert-to-f2fs-sh kernel:process setsched; diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts index 175a446f..5f063b9c 100644 --- a/whitechapel_pro/file_contexts +++ b/whitechapel_pro/file_contexts @@ -14,7 +14,6 @@ /vendor/bin/init\.insmod\.sh u:object_r:init-insmod-sh_exec:s0 /vendor/bin/trusty_apploader u:object_r:trusty_apploader_exec:s0 /vendor/bin/trusty_metricsd u:object_r:trusty_metricsd_exec:s0 -/vendor/bin/convert_to_f2fs\.sh u:object_r:convert-to-f2fs-sh_exec:s0 /vendor/bin/usf_stats u:object_r:vendor_usf_stats:s0 /vendor/bin/usf_reg_edit u:object_r:vendor_usf_reg_edit:s0 /vendor/bin/dumpsys u:object_r:vendor_dumpsys:s0