From 5c094cad8949a0a3889a49371d3f21c8c4396954 Mon Sep 17 00:00:00 2001 From: Edwin Moquete Date: Fri, 17 Feb 2023 15:33:28 +0800 Subject: [PATCH] sdm660-common: Switch to FBEv2 emmc optimised encryption Signed-off-by: pix106 --- properties/vendor.prop | 9 ++++++--- rootdir/etc/fstab.qcom | 4 ++-- rootdir/etc/fstab_A.qcom | 4 ++-- rootdir/etc/fstab_AB.qcom | 4 ++-- rootdir/etc/init.target.rc | 5 ++++- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/properties/vendor.prop b/properties/vendor.prop index 07717dd3..b4e4802b 100644 --- a/properties/vendor.prop +++ b/properties/vendor.prop @@ -1,6 +1,3 @@ -# Adoptable Storage -ro.crypto.volume.options=aes-256-xts - # ART pm.dexopt.ab-ota=speed-profile dalvik.vm.dex2oat64.enabled=true @@ -122,6 +119,12 @@ persist.vendor.audio.spatializer.speaker_enabled=true # Camera vendor.camera.aux.packageblacklist=com.discord +# Crypto +ro.crypto.dm_default_key.options_format.version=2 +ro.crypto.volume.filenames_mode=aes-256-cts +ro.crypto.volume.metadata.method=dm-default-key +ro.crypto.volume.options=::v2 + # Data persist.vendor.data.iwlan.enable=true persist.vendor.data.mode=concurrent diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index b0d51026..3affe971 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -12,8 +12,8 @@ # Non-A/B fstab.qcom variant # /dev/block/zram0 none swap defaults zramsize=50%,zram_backingdev_size=512M -/dev/block/bootdevice/by-name/userdata /data ext4 nodev,nosuid,barrier=1,noauto_da_alloc,discard,lazytime wait,check,fileencryption=ice,quota,reservedsize=128M,fsverity -/dev/block/bootdevice/by-name/userdata /data f2fs nodev,nosuid,fsync_mode=nobarrier,lazytime,background_gc=sync,gc_merge,atgc,checkpoint_merge wait,check,fileencryption=ice,quota,reservedsize=128M,fsverity +/dev/block/bootdevice/by-name/userdata /data f2fs nodev,nosuid,fsync_mode=nobarrier,lazytime,background_gc=sync,gc_merge,atgc,checkpoint_merge latemount,wait,check,fileencryption=aes-256-xts:aes-256-cts:v2+emmc_optimized,checkpoint=fs,quota,reservedsize=128M,fsverity +/dev/block/bootdevice/by-name/userdata /data ext4 nodev,nosuid,barrier=1,noauto_da_alloc,discard,lazytime latemount,wait,check,fileencryption=aes-256-xts:aes-256-cts:v2+emmc_optimized,checkpoint=fs,quota,reservedsize=128M,fsverity /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults /dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait /dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait diff --git a/rootdir/etc/fstab_A.qcom b/rootdir/etc/fstab_A.qcom index e9febeef..9f33cc06 100644 --- a/rootdir/etc/fstab_A.qcom +++ b/rootdir/etc/fstab_A.qcom @@ -12,8 +12,8 @@ # /dev/block/zram0 none swap defaults zramsize=50%,zram_backingdev_size=512M /dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,avb -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,discard,noauto_da_alloc,lazytime wait,check,formattable,fileencryption=ice,quota,reservedsize=128M,fsverity -/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,fsync_mode=nobarrier,lazytime,background_gc=sync,gc_merge,atgc,checkpoint_merge wait,check,formattable,fileencryption=ice,quota,reservedsize=128M,fsverity +/dev/block/bootdevice/by-name/userdata /data f2fs nodev,nosuid,fsync_mode=nobarrier,lazytime,background_gc=sync,gc_merge,atgc,checkpoint_merge latemount,wait,check,fileencryption=aes-256-xts:aes-256-cts:v2+emmc_optimized,checkpoint=fs,quota,reservedsize=128M,fsverity +/dev/block/bootdevice/by-name/userdata /data ext4 nodev,nosuid,barrier=1,discard,noauto_da_alloc,lazytime latemount,wait,check,fileencryption=aes-256-xts:aes-256-cts:v2+emmc_optimized,checkpoint=fs,quota,reservedsize=128M,fsverity /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults /dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait /dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait diff --git a/rootdir/etc/fstab_AB.qcom b/rootdir/etc/fstab_AB.qcom index b676e6ee..e353d75e 100644 --- a/rootdir/etc/fstab_AB.qcom +++ b/rootdir/etc/fstab_AB.qcom @@ -9,8 +9,8 @@ # /dev/block/zram0 none swap defaults zramsize=50%,zram_backingdev_size=512M /dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect -/dev/block/bootdevice/by-name/userdata /data ext4 nodev,nosuid,barrier=1,noauto_da_alloc,discard,lazytime wait,check,encryptable=footer,quota,formattable,length=-16384,fsverity -/dev/block/bootdevice/by-name/userdata /data f2fs nodev,nosuid,inline_xattr,reserve_root=32768,resgid=1065,lazytime,background_gc=sync,gc_merge,atgc,checkpoint_merge wait,check,encryptable=footer,quota,formattable,length=-16384,fsverity +/dev/block/bootdevice/by-name/userdata /data f2fs nodev,nosuid,fsync_mode=nobarrier,lazytime,background_gc=sync,gc_merge,atgc,checkpoint_merge latemount,wait,check,fileencryption=aes-256-xts:aes-256-cts:v2+emmc_optimized,checkpoint=fs,quota,reservedsize=128M,fsverity +/dev/block/bootdevice/by-name/userdata /data ext4 nodev,nosuid,barrier=1,noauto_da_alloc,discard,lazytime latemount,wait,check,fileencryption=aes-256-xts:aes-256-cts:v2+emmc_optimized,checkpoint=fs,quota,reservedsize=128M,fsverity /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults /dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect /dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc index c4be7c03..bc71fefd 100755 --- a/rootdir/etc/init.target.rc +++ b/rootdir/etc/init.target.rc @@ -143,7 +143,7 @@ on init on fs wait /dev/block/platform/soc/${ro.boot.bootdevice} symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice - mount_all /vendor/etc/fstab.qcom + mount_all --early /vendor/etc/fstab.qcom chown root system /mnt/vendor/persist chmod 0771 /mnt/vendor/persist mkdir /mnt/vendor/persist/data 0700 system system @@ -156,6 +156,9 @@ on fs chmod 0644 /mnt/vendor/dsp/fastrpc_shell_3 mount none /mnt/vendor/dsp/fastrpc_shell_3 /vendor/dsp/cdsp/fastrpc_shell_3 bind +on late-fs + mount_all --late /vendor/etc/fstab.qcom + on post-fs start vendor.qseecomd wait_for_prop vendor.sys.listeners.registered true