commit 9d8fd77804d5a07bf62a40e5e65d72859166e97b
author Keith Mok <keithmok@google.com> Thu Aug 25 19:24:56 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Aug 31 04:20:34 2022 +0000
tree e22a21aaebd677ac3bd7e84b3e1631cf70d630a7
parent 81c7d1d8530b6a99c8a215b66f197a7338a64718

DO NOT MERGE - Revert "Add length check when copy AVDTP packet"

This reverts commit ed9a843cf147bbfa1a80f2507769014958940eb4.

Reason for revert: partial fix with memory leak regression

Bug: 232023771
Test: manual
Change-Id: Id37da8f8ceeaada7c54d42cdbcd2b7a830be6199
(cherry picked from commit 31035a7559a8ea473b68493ae390d72525d6d4f9)
Merged-In: Id37da8f8ceeaada7c54d42cdbcd2b7a830be6199

system/stack/avdt/avdt_msg.cc

diff --git a/system/stack/avdt/avdt_msg.cc b/system/stack/avdt/avdt_msg.cc
index 7a3ed28..a3e71c8 100644
--- a/system/stack/avdt/avdt_msg.cc
+++ b/system/stack/avdt/avdt_msg.cc
@@ -1252,10 +1252,6 @@
      * would have allocated smaller buffer.
      */
     p_ccb->p_rx_msg = (BT_HDR*)osi_malloc(BT_DEFAULT_BUFFER_SIZE);
-    if (sizeof(BT_HDR) + p_buf->offset + p_buf->len > BT_DEFAULT_BUFFER_SIZE) {
-      android_errorWriteLog(0x534e4554, "232023771");
-      return NULL;
-    }
     memcpy(p_ccb->p_rx_msg, p_buf, sizeof(BT_HDR) + p_buf->offset + p_buf->len);
 
     /* Free original buffer */