| commit | 5a8869456e062e03850a096830341edf85dd726d | [log] [tgz] |
|---|---|---|
| author | Hamzeh Zawawy <hamzeh@google.com> | Tue Dec 01 18:58:17 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 01 18:58:17 2020 +0000 |
| tree | caaf6f5d6f869554651e86ae62bf57983e8ef759 | |
| parent | 616a325593ff8bd90fc3d1c3f24f909e239da8af [diff] | |
| parent | da2960df35e424b297ab68524bf077e898f7d721 [diff] |
Merge "Resolved UAF issue in RefBase fuzzer" am: 9a79c84499 am: da2960df35 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1424812 Change-Id: I64785b4b385d9b65a71d6b8cbf316b4b89df6a58
diff --git a/fastboot/device/commands.cpp b/fastboot/device/commands.cpp index 4601960..2b2a0bf 100644 --- a/fastboot/device/commands.cpp +++ b/fastboot/device/commands.cpp
@@ -228,6 +228,11 @@ return device->WriteStatus(FastbootResult::FAIL, "Unable to open fastboot HAL"); } + //Disable "oem postwipedata userdata" to prevent user wipe oem userdata only. + if (args[0] == "oem postwipedata userdata") { + return device->WriteStatus(FastbootResult::FAIL, "Unable to do oem postwipedata userdata"); + } + Result ret; auto ret_val = fastboot_hal->doOemCommand(args[0], [&](Result result) { ret = result; }); if (!ret_val.isOk()) {