PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the wrong parameter when calling read_metadata_from_package()."

Browse Source 
am: 6014db5da6

Change-Id: I55b44f34491f8103487bcd7b871d3615666b45d9
This commit is contained in:
Tao Bao
2017-03-24 20:16:26 +00:00
committed by android-build-merger
parent eddc9a15f9 6014db5da6
commit 5da7e41ec8
1 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
+35 -37
View File
@@ -793,47 +793,45 @@ static bool wipe_cache(bool should_confirm, Device* device) {
return success; return success;
} }
// Secure-wipe a given partition. It uses BLKSECDISCARD, if supported. // Secure-wipe a given partition. It uses BLKSECDISCARD, if supported. Otherwise, it goes with
// Otherwise, it goes with BLKDISCARD (if device supports BLKDISCARDZEROES) or // BLKDISCARD (if device supports BLKDISCARDZEROES) or BLKZEROOUT.
// BLKZEROOUT.
static bool secure_wipe_partition(const std::string& partition) { static bool secure_wipe_partition(const std::string& partition) {
android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(partition.c_str(), O_WRONLY))); android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(partition.c_str(), O_WRONLY)));
if (fd == -1) { if (fd == -1) {
PLOG(ERROR) << "failed to open \"" << partition << "\""; PLOG(ERROR) << "Failed to open \"" << partition << "\"";
return false;
}
uint64_t range[2] = { 0, 0 };
if (ioctl(fd, BLKGETSIZE64, &range[1]) == -1 || range[1] == 0) {
PLOG(ERROR) << "Failed to get partition size";
return false;
}
LOG(INFO) << "Secure-wiping \"" << partition << "\" from " << range[0] << " to " << range[1];
LOG(INFO) << " Trying BLKSECDISCARD...";
if (ioctl(fd, BLKSECDISCARD, &range) == -1) {
PLOG(WARNING) << " Failed";
// Use BLKDISCARD if it zeroes out blocks, otherwise use BLKZEROOUT.
unsigned int zeroes;
if (ioctl(fd, BLKDISCARDZEROES, &zeroes) == 0 && zeroes != 0) {
LOG(INFO) << " Trying BLKDISCARD...";
if (ioctl(fd, BLKDISCARD, &range) == -1) {
PLOG(ERROR) << " Failed";
return false; return false;
} }
} else {
uint64_t range[2] = {0, 0}; LOG(INFO) << " Trying BLKZEROOUT...";
if (ioctl(fd, BLKGETSIZE64, &range[1]) == -1 || range[1] == 0) { if (ioctl(fd, BLKZEROOUT, &range) == -1) {
PLOG(ERROR) << "failed to get partition size"; PLOG(ERROR) << " Failed";
return false; return false;
}
} }
printf("Secure-wiping \"%s\" from %" PRIu64 " to %" PRIu64 ".\n", }
partition.c_str(), range[0], range[1]);
printf("Trying BLKSECDISCARD...\t"); LOG(INFO) << " Done";
if (ioctl(fd, BLKSECDISCARD, &range) == -1) { return true;
printf("failed: %s\n", strerror(errno));
// Use BLKDISCARD if it zeroes out blocks, otherwise use BLKZEROOUT.
unsigned int zeroes;
if (ioctl(fd, BLKDISCARDZEROES, &zeroes) == 0 && zeroes != 0) {
printf("Trying BLKDISCARD...\t");
if (ioctl(fd, BLKDISCARD, &range) == -1) {
printf("failed: %s\n", strerror(errno));
return false;
}
} else {
printf("Trying BLKZEROOUT...\t");
if (ioctl(fd, BLKZEROOUT, &range) == -1) {
printf("failed: %s\n", strerror(errno));
return false;
}
}
}
printf("done\n");
return true;
} }
// Check if the wipe package matches expectation: // Check if the wipe package matches expectation:
@@ -865,7 +863,7 @@ static bool check_wipe_package(size_t wipe_package_size) {
return false; return false;
} }
std::string metadata; std::string metadata;
if (!read_metadata_from_package(&zip, &metadata)) { if (!read_metadata_from_package(zip, &metadata)) {
CloseArchive(zip); CloseArchive(zip);
return false; return false;
} }