Commit: f049e304c7fd2619ccdddc449e0c13ab7ed7f50e - system-bt (git)

system/bt

Commit MetaInfo

• Revision: f049e304c7fd2619ccdddc449e0c13ab7ed7f50e (tree)
• Zeit: 2018-10-17 08:08:50
• Autor: Ugo Yu <ugoyu@goog...>
• Commiter: Rohit Yengisetty

Log Message

DO NOT MERGE - Check SDU lower bound before allocate p_data

Bug: 112321180
Test: SL4A BleCocTest:test_coc_insecured_connection_write_ascii
Change-Id: Id0c9aa2097f0b6bdc2bb9fa9086daa9452188e1d
(cherry picked from commit 87bcda81b8209a71b32351b54cedaad48a7a56b4)

Ändern Zusammenfassung

• modified: stack/l2cap/l2c_fcr.c

Diff

--- a/stack/l2cap/l2c_fcr.c
+++ b/stack/l2cap/l2c_fcr.c
@@ -849,6 +849,14 @@ void l2c_lcc_proc_pdu(tL2C_CCB *p_ccb, BT_HDR *p_buf)
             return;
         }
 
+        if (sdu_length < p_buf->len) {
+            L2CAP_TRACE_ERROR("%s: Invalid sdu_length: %d", __func__, sdu_length);
+            android_errorWriteWithInfoLog(0x534e4554, "112321180", -1, NULL, 0);
+            /* Discard the buffer */
+            osi_free(p_buf);
+            return;
+        }
+
 
         if ((p_data = (BT_HDR *) osi_malloc(L2CAP_MAX_BUF_SIZE)) == NULL)
         {