commit ca25313d9ee4ba9a96f5244de1626911a7d63d32
author Pavlin Radoslavov <pavlin@google.com> Thu May 31 11:04:54 2018 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jul 20 00:30:25 2018 +0000
tree 9a081e3008f1ec5d7a065a82bd6f8598333eb6cd
parent 863938504f4f687c8ee4c334b0a10dbc149ed739

Add BT_HDR length check for received AVCTP packets

Bug: 79944113
Test: Code compilation
Change-Id: I02c76ab8fad61669394062bf34656ea32f465b6a
Merged-In: I02c76ab8fad61669394062bf34656ea32f465b6a
(cherry picked from commit 4262b932e487b19d578d79e0120cf03291f44efc)
(cherry picked from commit fa538540a7f147b8440ac49735a8dc596ce8dfc7)

stack/avct/avct_bcb_act.cc

diff --git a/stack/avct/avct_bcb_act.cc b/stack/avct/avct_bcb_act.cc
index 70d8ce7..011a52d 100644
--- a/stack/avct/avct_bcb_act.cc
+++ b/stack/avct/avct_bcb_act.cc
@@ -69,6 +69,12 @@
   uint8_t* p;
   uint8_t pkt_type;
 
+  if (p_buf->len == 0) {
+    osi_free_and_reset((void**)&p_buf);
+    android_errorWriteLog(0x534e4554, "79944113");
+    return nullptr;
+  }
+
   /* parse the message header */
   p = (uint8_t*)(p_buf + 1) + p_buf->offset;
   pkt_type = AVCT_PKT_TYPE(p);