commit 1a3456f0bce99cdbec087cfb0199c113ca722304
author Arun Sharma <arsharma@google.com> Tue Oct 03 14:55:48 2023 -0700
committer Arun Sharma <arsharma@google.com> Thu Oct 05 16:35:24 2023 +0000
tree d6c32ac845df8c88e38136d66e7818a085f61a44
parent b533f531df496eab632832717a3b71272b6d4dbe

FastbootDevice::boot1_1 null pointer dereference

FastbootDevice::boot1_1 attempts to dereference a null pointer when the
boot_control_hal_ is not set. It needs a guard statement to prevent
that.

Test: Manually tested on device without BootControl.
Bug: 301682120
Change-Id: Id86bcb915c8e2857bda26f64738dd5b643048e98

fastboot/device/fastboot_device.cpp

diff --git a/fastboot/device/fastboot_device.cpp b/fastboot/device/fastboot_device.cpp
index 6b6a982..0dc4e97 100644
--- a/fastboot/device/fastboot_device.cpp
+++ b/fastboot/device/fastboot_device.cpp
@@ -151,7 +151,8 @@
 }
 
 BootControlClient* FastbootDevice::boot1_1() const {
-    if (boot_control_hal_->GetVersion() >= android::hal::BootControlVersion::BOOTCTL_V1_1) {
+    if (boot_control_hal_ &&
+        boot_control_hal_->GetVersion() >= android::hal::BootControlVersion::BOOTCTL_V1_1) {
         return boot_control_hal_.get();
     }
     return nullptr;