tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove check that only allows microdroid vendor partition on debuggable VMs

Browse source 
The microdroid vendor partition is now verified during Microdroid boot,
so no need for this check.

Bug: 287593065
Test: AVF presubmit
Change-Id: I84811f818ef1140f1fe93d9da5f9ee61341e75dd
This commit is contained in:
Nikita Ioffe 2024-03-26 18:04:21 +00:00
parent ad55fad080
commit d28f45772f
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
init/first_stage_init.cpp
View file

@ -408,18 +408,6 @@ int FirstStageMain(int argc, char** argv) {
LOG(INFO) << "init first stage started!";
// We only allow /vendor partition in debuggable Microdrod until it is verified during boot.
// TODO(b/285855436): remove this check.
if (IsMicrodroid()) {
bool mount_vendor =
cmdline.find("androidboot.microdroid.mount_vendor=1") != std::string::npos;
bool debuggable =
bootconfig.find("androidboot.microdroid.debuggable = \"1\"") != std::string::npos;
if (mount_vendor && !debuggable) {
LOG(FATAL) << "Attempted to mount /vendor partition for non-debuggable Microdroid VM";
}
}
auto old_root_dir = std::unique_ptr<DIR, decltype(&closedir)>{opendir("/"), closedir};
if (!old_root_dir) {
PLOG(ERROR) << "Could not opendir(\"/\"), not freeing ramdisk";