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

Merge "init: Fix writing "reboot recovery" to BCB"

Browse source
This commit is contained in:
Tom Cherry 2020-01-08 17:15:08 +00:00 • committed by Gerrit Code Review
commit a4b446d766
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
init/reboot.cpp
View file

@ -860,6 +860,30 @@ static void HandleUserspaceReboot() {
am.QueueBuiltinAction(handler, "userspace-reboot");
}
/**
* Check if "command" field is set in bootloader message.
*
* If "command" field is broken (contains non-printable characters prior to
* terminating zero), it will be zeroed.
*
* @param[in,out] boot Bootloader message (BCB) structure
* @return true if "command" field is already set, and false if it's empty
*/
static bool CommandIsPresent(bootloader_message* boot) {
if (boot->command[0] == '\0')
return false;
for (size_t i = 0; i < arraysize(boot->command); ++i) {
if (boot->command[i] == '\0')
return true;
if (!isprint(boot->command[i]))
break;
}
memset(boot->command, 0, sizeof(boot->command));
return false;
}
void HandlePowerctlMessage(const std::string& command) {
unsigned int cmd = 0;
std::vector<std::string> cmd_params = Split(command, ",");
@ -912,7 +936,7 @@ void HandlePowerctlMessage(const std::string& command) {
}
// Update the boot command field if it's empty, and preserve
// the other arguments in the bootloader message.
if (boot.command[0] == '\0') {
if (!CommandIsPresent(&boot)) {
strlcpy(boot.command, "boot-recovery", sizeof(boot.command));
if (std::string err; !write_bootloader_message(boot, &err)) {
LOG(ERROR) << "Failed to set bootloader message: " << err;