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

Commit 643ddd99 authored by David Anderson's avatar David Anderson
Browse files

boot_control: Don't allow current_slot_ to be -1. 

If the HAL is run on a non-A/B device, it does not fail gracefully; it
will segfault because the current_slot is -1 and methods do not protect
against this. Instead, have Init() fail if we can't determine the
current slot.

Bug: 130078382
Test: vts tests
Change-Id: I2d3094518a842b1a764427d2da9d46781a9f26da
parent e3a35dc8

boot_control/libboot_control.cpp

+4 −0
Original line number Diff line number Diff line
@@ -196,6 +196,10 @@ bool BootControl::Init() { 
  // was not set (from either the command line or the device tree), we can later

  // initialize it from the bootloader_control struct.

  std::string suffix_prop = android::base::GetProperty("ro.boot.slot_suffix", "");

  if (suffix_prop.empty()) {

    LOG(ERROR) << "Slot suffix property is not set";

    return false;

  }

  current_slot_ = SlotSuffixToIndex(suffix_prop.c_str());



  std::string err;