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

Merge "Detect the absence of the default fstab" am: d9b7c9b4a7 am: 900c6010e0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib875baf7cc43994060573d24b3f95ae4d6d637c7
This commit is contained in:
Treehugger Robot 2021-03-02 22:28:26 +00:00 • committed by Automerger Merge Worker
commit 8cc232422c
1 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
init/first_stage_mount.cpp
View file

@ -44,6 +44,7 @@
#include "block_dev_initializer.h" #include "block_dev_initializer.h"
#include "devices.h" #include "devices.h"
#include "result.h"
#include "snapuserd_transition.h" #include "snapuserd_transition.h"
#include "switch_root.h" #include "switch_root.h"
#include "uevent.h" #include "uevent.h"
@ -51,6 +52,7 @@
#include "util.h" #include "util.h"
using android::base::ReadFileToString; using android::base::ReadFileToString;
using android::base::Result;
using android::base::Split; using android::base::Split;
using android::base::StringPrintf; using android::base::StringPrintf;
using android::base::Timer; using android::base::Timer;
@ -81,7 +83,7 @@ class FirstStageMount {
// The factory method to create either FirstStageMountVBootV1 or FirstStageMountVBootV2 // The factory method to create either FirstStageMountVBootV1 or FirstStageMountVBootV2
// based on device tree configurations. // based on device tree configurations.
static std::unique_ptr<FirstStageMount> Create(); static Result<std::unique_ptr<FirstStageMount>> Create();
bool DoCreateDevices(); // Creates devices and logical partitions from storage devices bool DoCreateDevices(); // Creates devices and logical partitions from storage devices
bool DoFirstStageMount(); // Mounts fstab entries read from device tree. bool DoFirstStageMount(); // Mounts fstab entries read from device tree.
bool InitDevices(); bool InitDevices();
@ -160,7 +162,7 @@ static inline bool IsDtVbmetaCompatible(const Fstab& fstab) {
return is_android_dt_value_expected("vbmeta/compatible", "android,vbmeta"); return is_android_dt_value_expected("vbmeta/compatible", "android,vbmeta");
} }
static Fstab ReadFirstStageFstab() { static Result<Fstab> ReadFirstStageFstab() {
Fstab fstab; Fstab fstab;
if (!ReadFstabFromDt(&fstab)) { if (!ReadFstabFromDt(&fstab)) {
if (ReadDefaultFstab(&fstab)) { if (ReadDefaultFstab(&fstab)) {
@ -170,7 +172,7 @@ static Fstab ReadFirstStageFstab() {
}), }),
fstab.end()); fstab.end());
} else { } else {
LOG(INFO) << "Failed to fstab for first stage mount"; return Error() << "failed to read default fstab for first stage mount";
} }
} }
return fstab; return fstab;
@ -236,12 +238,16 @@ FirstStageMount::FirstStageMount(Fstab fstab) : need_dm_verity_(false), fstab_(s
super_partition_name_ = fs_mgr_get_super_partition_name(); super_partition_name_ = fs_mgr_get_super_partition_name();
} }
std::unique_ptr<FirstStageMount> FirstStageMount::Create() { Result<std::unique_ptr<FirstStageMount>> FirstStageMount::Create() {
auto fstab = ReadFirstStageFstab(); auto fstab = ReadFirstStageFstab();
if (IsDtVbmetaCompatible(fstab)) { if (!fstab.ok()) {
return std::make_unique<FirstStageMountVBootV2>(std::move(fstab)); return fstab.error();
}
if (IsDtVbmetaCompatible(*fstab)) {
return std::make_unique<FirstStageMountVBootV2>(std::move(*fstab));
} else { } else {
return std::make_unique<FirstStageMountVBootV1>(std::move(fstab)); return std::make_unique<FirstStageMountVBootV1>(std::move(*fstab));
} }
} }
@ -836,12 +842,12 @@ bool FirstStageMountVBootV2::InitAvbHandle() {
// ---------------- // ----------------
// Creates devices and logical partitions from storage devices // Creates devices and logical partitions from storage devices
bool DoCreateDevices() { bool DoCreateDevices() {
std::unique_ptr<FirstStageMount> handle = FirstStageMount::Create(); auto fsm = FirstStageMount::Create();
if (!handle) { if (!fsm.ok()) {
LOG(ERROR) << "Failed to create FirstStageMount"; LOG(ERROR) << "Failed to create FirstStageMount: " << fsm.error();
return false; return false;
} }
return handle->DoCreateDevices(); return (*fsm)->DoCreateDevices();
} }
// Mounts partitions specified by fstab in device tree. // Mounts partitions specified by fstab in device tree.
@ -852,17 +858,17 @@ bool DoFirstStageMount(bool create_devices) {
return true; return true;
} }
std::unique_ptr<FirstStageMount> handle = FirstStageMount::Create(); auto fsm = FirstStageMount::Create();
if (!handle) { if (!fsm.ok()) {
LOG(ERROR) << "Failed to create FirstStageMount"; LOG(ERROR) << "Failed to create FirstStageMount " << fsm.error();
return false; return false;
} }
if (create_devices) { if (create_devices) {
if (!handle->DoCreateDevices()) return false; if (!(*fsm)->DoCreateDevices()) return false;
} }
return handle->DoFirstStageMount(); return (*fsm)->DoFirstStageMount();
} }
void SetInitAvbVersionInRecovery() { void SetInitAvbVersionInRecovery() {
@ -872,8 +878,12 @@ void SetInitAvbVersionInRecovery() {
} }
auto fstab = ReadFirstStageFstab(); auto fstab = ReadFirstStageFstab();
if (!fstab.ok()) {
LOG(ERROR) << fstab.error();
return;
}
if (!IsDtVbmetaCompatible(fstab)) { if (!IsDtVbmetaCompatible(*fstab)) {
LOG(INFO) << "Skipped setting INIT_AVB_VERSION (not vbmeta compatible)"; LOG(INFO) << "Skipped setting INIT_AVB_VERSION (not vbmeta compatible)";
return; return;
} }
@ -883,7 +893,7 @@ void SetInitAvbVersionInRecovery() {
// We only set INIT_AVB_VERSION when the AVB verification succeeds, i.e., the // We only set INIT_AVB_VERSION when the AVB verification succeeds, i.e., the
// Open() function returns a valid handle. // Open() function returns a valid handle.
// We don't need to mount partitions here in recovery mode. // We don't need to mount partitions here in recovery mode.
FirstStageMountVBootV2 avb_first_mount(std::move(fstab)); FirstStageMountVBootV2 avb_first_mount(std::move(*fstab));
if (!avb_first_mount.InitDevices()) { if (!avb_first_mount.InitDevices()) {
LOG(ERROR) << "Failed to init devices for INIT_AVB_VERSION"; LOG(ERROR) << "Failed to init devices for INIT_AVB_VERSION";
return; return;