ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "remount: Simplify disable verity logic"

Browse source
This commit is contained in:
Yi-yo Chiang 2022-11-14 07:13:27 +00:00 • committed by Gerrit Code Review
commit d1b270abb2
1 changed files with 13 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
fs_mgr/fs_mgr_remount.cpp
View file

@ -294,37 +294,12 @@ struct RemountCheckResult {
bool remounted_anything = false; bool remounted_anything = false;
}; };
static RemountStatus CheckVerity(const FstabEntry& entry, RemountCheckResult* result) { RemountStatus CheckOverlayfs(Fstab* partitions, RemountCheckResult* result) {
if (!fs_mgr_is_verity_enabled(entry)) {
return REMOUNT_SUCCESS;
}
std::unique_ptr<AvbOps, decltype(&::avb_ops_user_free)> ops(avb_ops_user_new(),
&::avb_ops_user_free);
if (!ops) {
return VERITY_PARTITION;
}
if (!avb_user_verity_set(ops.get(), fs_mgr_get_slot_suffix().c_str(), false)) {
return VERITY_PARTITION;
}
result->disabled_verity = true;
result->reboot_later = true;
return REMOUNT_SUCCESS;
}
static RemountStatus CheckVerityAndOverlayfs(Fstab* partitions, RemountCheckResult* result) {
RemountStatus status = REMOUNT_SUCCESS; RemountStatus status = REMOUNT_SUCCESS;
for (auto it = partitions->begin(); it != partitions->end();) { for (auto it = partitions->begin(); it != partitions->end();) {
auto& entry = *it; auto& entry = *it;
const auto& mount_point = entry.mount_point; const auto& mount_point = entry.mount_point;
if (auto rv = CheckVerity(entry, result); rv != REMOUNT_SUCCESS) {
LOG(ERROR) << "Skipping verified partition " << mount_point << " for remount";
status = rv;
it = partitions->erase(it);
continue;
}
if (fs_mgr_wants_overlayfs(&entry)) { if (fs_mgr_wants_overlayfs(&entry)) {
bool want_reboot = false; bool want_reboot = false;
bool force = result->disabled_verity; bool force = result->disabled_verity;
@ -514,8 +489,18 @@ static int do_remount(Fstab& fstab, const std::vector<std::string>& partition_ar
} }
} }
// Check verity and optionally setup overlayfs backing. // Disable verity.
auto retval = CheckVerityAndOverlayfs(&partitions, check_result); auto verity_result = SetVerityState(false /* enable_verity */);
if (!verity_result.success) {
return VERITY_PARTITION;
}
if (verity_result.want_reboot) {
check_result->reboot_later = true;
check_result->disabled_verity = true;
}
// Optionally setup overlayfs backing.
auto retval = CheckOverlayfs(&partitions, check_result);
if (partitions.empty() || check_result->disabled_verity) { if (partitions.empty() || check_result->disabled_verity) {
if (partitions.empty()) { if (partitions.empty()) {