diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-01-13 22:30:51 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-13 22:30:51 +0000 |
commit | 5db49a357d56b548e6ed254f683da8a52010294e (patch) | |
tree | d6936ef699d8dc39ad2d618f533653b3987ff157 | |
parent | f554b33bb9701517b42254df8790f14300672685 (diff) | |
parent | aa0a88def3bc93693a843beb5ad74877576ac0a8 (diff) | |
download | recovery-5db49a357d56b548e6ed254f683da8a52010294e.tar.gz |
Merge "Reland "Only format /data in recovery if user specified a new fstype"" into main
-rw-r--r-- | recovery_utils/roots.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/recovery_utils/roots.cpp b/recovery_utils/roots.cpp index 6396d446..e7a7d652 100644 --- a/recovery_utils/roots.cpp +++ b/recovery_utils/roots.cpp @@ -177,8 +177,25 @@ int format_volume(const std::string& volume, const std::string& directory, } // If the raw disk will be used as a metadata encrypted device mapper target, - // next boot will first mount this partition as read only, and then unmount, - // call encrypt_inplace. + // next boot will do encrypt_in_place the raw disk. While fs_mgr mounts /data + // as RO to avoid write file operations before encrypt_inplace, this code path + // is not well tested so we would like to avoid it if possible. For safety, + // let vold do the formatting on boot for metadata encrypted devices, except + // when user specified a new fstype. Because init formats /data according + // to fstab, it's difficult to override the fstab in init. + if (!v->metadata_key_dir.empty() && length == 0 && new_fstype.empty()) { + android::base::unique_fd fd(open(v->blk_device.c_str(), O_RDWR)); + if (fd == -1) { + PLOG(ERROR) << "format_volume: failed to open " << v->blk_device; + return -1; + } + int64_t device_size = get_file_size(fd.get(), 0); + if (device_size > 0 && !wipe_block_device(fd.get(), device_size)) { + LOG(INFO) << "format_volume: wipe metadata encrypted " << v->blk_device << " with size " + << device_size; + return 0; + } + } if ((v->fs_type == "ext4" && new_fstype.empty()) || new_fstype == "ext4") { LOG(INFO) << "Formatting " << v->blk_device << " as ext4"; |