Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3222dc0d authored by David Zeuthen's avatar David Zeuthen
Browse files

update_verifier: Support androidboot.veritymode being empty or 'disabled'. 

Bootloaders using libavb will set androidboot.veritymode=disabled if
the "disable dm-verity" flag has been set. Additionally if the
"disable verification" flag is set androidboot.veritymode will not be
set at all. Handle both cases.

Without this fix we'll end up in a bootloop.

Test: Manually tested on a device using AVB.
(cherry-picked from commit 1a0929cc8aac532dba00b3c98cea22715719a421)
Bug: 64404283
Change-Id: I3adf93f8dfd528fe9b869a63afa775f5730a3f69
parent 5e47d516

update_verifier/update_verifier.cpp

+17 −4
Original line number Diff line number Diff line
@@ -239,24 +239,37 @@ int update_verifier(int argc, char** argv) { 
    // The current slot has not booted successfully.



#if defined(PRODUCT_SUPPORTS_VERITY) || defined(BOARD_AVB_ENABLE)

    bool skip_verification = false;

    std::string verity_mode = android::base::GetProperty("ro.boot.veritymode", "");

    if (verity_mode.empty()) {

      // With AVB it's possible to disable verification entirely and

      // in this case ro.boot.veritymode is empty.

#if defined(BOARD_AVB_ENABLE)

      LOG(WARNING) << "verification has been disabled; marking without verification.";

      skip_verification = true;

#else

      LOG(ERROR) << "Failed to get dm-verity mode.";

      return reboot_device();

#endif

    } else if (android::base::EqualsIgnoreCase(verity_mode, "eio")) {

      // We shouldn't see verity in EIO mode if the current slot hasn't booted successfully before.

      // Continue the verification until we fail to read some blocks.

      LOG(WARNING) << "Found dm-verity in EIO mode.";

    } else if (android::base::EqualsIgnoreCase(verity_mode, "disabled")) {

      LOG(WARNING) << "dm-verity in disabled mode; marking without verification.";

      skip_verification = true;

    } else if (verity_mode != "enforcing") {

      LOG(ERROR) << "Unexpected dm-verity mode : " << verity_mode << ", expecting enforcing.";

      return reboot_device();

    }



    if (!skip_verification) {

      static constexpr auto CARE_MAP_FILE = "/data/ota_package/care_map.txt";

      if (!verify_image(CARE_MAP_FILE)) {

        LOG(ERROR) << "Failed to verify all blocks in care map file.";

        return reboot_device();

      }

    }

#else

    LOG(WARNING) << "dm-verity not enabled; marking without verification.";

#endif