Commit: e88c30b7dc0a3b3dbfe6c9e5620927fa2531700d - system-bt (git)

system/bt

Commit MetaInfo

• Revisão: e88c30b7dc0a3b3dbfe6c9e5620927fa2531700d (tree)
• Hora: 2018-12-05 01:21:12
• Autor: Ugo Yu <ugoyu@goog...>
• Commiter: Vasyl Gello

Mensagem de Log

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 6fc96f847be808a4f38eae45b5e9bbc3f18b9a2d)

Mudança Sumário

• modified: stack/l2cap/l2c_fcr.c

Diff

--- a/stack/l2cap/l2c_fcr.c
+++ b/stack/l2cap/l2c_fcr.c
@@ -880,6 +880,13 @@ 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)
         {