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

Merge "Add new dm-verity error handling mode" am: 26e5d8f1e2

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1675559

Change-Id: I8a15b219771989f19488450650c6fec85e26c508
This commit is contained in:
Treehugger Robot 2021-04-23 04:04:11 +00:00 • committed by Automerger Merge Worker
commit fdb4d18043
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/libdm/dm_target.cpp
View file

@ -95,7 +95,9 @@ void DmTargetVerity::UseFec(const std::string& device, uint32_t num_roots, uint3
}
void DmTargetVerity::SetVerityMode(const std::string& mode) {
if (mode != "restart_on_corruption" && mode != "ignore_corruption") {
if (mode != "panic_on_corruption" &&
mode != "restart_on_corruption" &&
mode != "ignore_corruption") {
LOG(ERROR) << "Unknown verity mode: " << mode;
valid_ = false;
return;

4
fs_mgr/libfs_avb/avb_util.cpp
View file

@ -61,7 +61,9 @@ bool ConstructVerityTable(const FsAvbHashtreeDescriptor& hashtree_desc,
// Converts veritymode to the format used in kernel.
std::string dm_verity_mode;
if (verity_mode == "enforcing") {
if (verity_mode == "panicking") {
dm_verity_mode = "panic_on_corruption";
} else if (verity_mode == "enforcing") {
dm_verity_mode = "restart_on_corruption";
} else if (verity_mode == "logging") {
dm_verity_mode = "ignore_corruption";