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

Merge "Disallow fastboot to modify locked DSU" into main

Browse source
This commit is contained in:
Chun-Wei Wang 2023-09-08 02:59:32 +00:00 • committed by Gerrit Code Review
commit 66b68dde92
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fastboot/device/commands.cpp
View file

@ -639,6 +639,12 @@ bool UpdateSuperHandler(FastbootDevice* device, const std::vector<std::string>&
return UpdateSuper(device, args[1], wipe);
}
static bool IsLockedDsu() {
std::string active_dsu;
android::gsi::GetActiveDsu(&active_dsu);
return android::base::EndsWith(active_dsu, ".lock");
}
bool GsiHandler(FastbootDevice* device, const std::vector<std::string>& args) {
if (args.size() != 2) {
return device->WriteFail("Invalid arguments");
@ -653,6 +659,11 @@ bool GsiHandler(FastbootDevice* device, const std::vector<std::string>& args) {
return device->WriteStatus(FastbootResult::FAIL, "No GSI is installed");
}
if ((args[1] == "wipe" || args[1] == "disable") && GetDeviceLockStatus() && IsLockedDsu()) {
// Block commands that modify the states of locked DSU
return device->WriteFail("Command not available on locked DSU/devices");
}
if (args[1] == "wipe") {
if (!android::gsi::UninstallGsi()) {
return device->WriteStatus(FastbootResult::FAIL, strerror(errno));