summaryrefslogtreecommitdiffstats
path: root/recovery_utils/roots.cpp
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2021-11-09 01:45:49 +0100
committerEric Biggers <ebiggers@google.com>2021-11-10 02:20:32 +0100
commita762e14f0312f8c97fb401ad94a2cde92404506a (patch)
tree9824e92ffae0e8aa80626b0c9663ff67c7f3dc94 /recovery_utils/roots.cpp
parentMerge "libminui for vendor" (diff)
downloadandroid_bootable_recovery-a762e14f0312f8c97fb401ad94a2cde92404506a.tar
android_bootable_recovery-a762e14f0312f8c97fb401ad94a2cde92404506a.tar.gz
android_bootable_recovery-a762e14f0312f8c97fb401ad94a2cde92404506a.tar.bz2
android_bootable_recovery-a762e14f0312f8c97fb401ad94a2cde92404506a.tar.lz
android_bootable_recovery-a762e14f0312f8c97fb401ad94a2cde92404506a.tar.xz
android_bootable_recovery-a762e14f0312f8c97fb401ad94a2cde92404506a.tar.zst
android_bootable_recovery-a762e14f0312f8c97fb401ad94a2cde92404506a.zip
Diffstat (limited to 'recovery_utils/roots.cpp')
-rw-r--r--recovery_utils/roots.cpp20
1 files changed, 3 insertions, 17 deletions
diff --git a/recovery_utils/roots.cpp b/recovery_utils/roots.cpp
index 19484478c..0b82c1ccd 100644
--- a/recovery_utils/roots.cpp
+++ b/recovery_utils/roots.cpp
@@ -33,8 +33,7 @@
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/unique_fd.h>
-#include <cryptfs.h>
-#include <ext4_utils/wipe.h>
+#include <ext4_utils/ext4_utils.h>
#include <fs_mgr.h>
#include <fs_mgr/roots.h>
@@ -161,29 +160,16 @@ int format_volume(const std::string& volume, const std::string& directory) {
needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false);
}
- // If there's a key_loc that looks like a path, it should be a block device for storing encryption
- // metadata. Wipe it too.
- if (!v->key_loc.empty() && v->key_loc[0] == '/') {
- LOG(INFO) << "Wiping " << v->key_loc;
- int fd = open(v->key_loc.c_str(), O_WRONLY | O_CREAT, 0644);
- if (fd == -1) {
- PLOG(ERROR) << "format_volume: Failed to open " << v->key_loc;
- return -1;
- }
- wipe_block_device(fd, get_file_size(fd));
- close(fd);
- }
-
int64_t length = 0;
if (v->length > 0) {
length = v->length;
- } else if (v->length < 0 || v->key_loc == "footer") {
+ } else if (v->length < 0) {
android::base::unique_fd fd(open(v->blk_device.c_str(), O_RDONLY));
if (fd == -1) {
PLOG(ERROR) << "format_volume: failed to open " << v->blk_device;
return -1;
}
- length = get_file_size(fd.get(), v->length ? -v->length : CRYPT_FOOTER_OFFSET);
+ length = get_file_size(fd.get(), -v->length);
if (length <= 0) {
LOG(ERROR) << "get_file_size: invalid size " << length << " for " << v->blk_device;
return -1;