commit dcd86215497e179cf00445bca48cd00f123fa001
author Ashish Kumar Gupta <kumarashishg@google.com> Tue Oct 17 15:54:31 2023 +0530
committer Ashish Kumar Gupta <kumarashishg@google.com> Tue Oct 17 10:40:21 2023 +0000
tree e9d49c635b0d794541020c03896a857dba6b3134
parent 0f93076d59f38e1a3f21471883dea925421d39e2

Add handling for wrong MTP driver path

Add handling for wrong MTP driver path which triggers NULL Pointer exception.

Bug: 271525755
Bug: 278722702
Test: SANITIZE_TARGET=hwaddress make ${FUZZER_NAME} && adb sync data && adb shell /data/fuzz/$(get_build_var TARGET_ARCH)/${FUZZER_NAME}/${FUZZER_NAME}
Change-Id: Iac54ca36bd749aa7763217ac637790551b0a8658

media/mtp/MtpPacket.cpp

diff --git a/media/mtp/MtpPacket.cpp b/media/mtp/MtpPacket.cpp
index 5faaac2..03dfa7f 100644
--- a/media/mtp/MtpPacket.cpp
+++ b/media/mtp/MtpPacket.cpp
@@ -175,6 +175,9 @@
 
 #ifdef MTP_HOST
 int MtpPacket::transfer(struct usb_request* request) {
+    if (request->dev == NULL) {
+        return -1;
+    }
     int result = usb_device_bulk_transfer(request->dev,
                             request->endpoint,
                             request->buffer,