diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2017-03-14 14:46:15 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2017-03-22 15:23:54 -0700 |
| commit | a4875a49404c544134df37022ae587a4a3321647 (patch) | |
| tree | b61df87fb03e135bf569f730d0f058416acf1dc2 | |
| parent | 5a9925784a4a34811ae29608b67dee4a580c226b (diff) | |
| download | android_system_bt-a4875a49404c544134df37022ae587a4a3321647.tar.gz android_system_bt-a4875a49404c544134df37022ae587a4a3321647.tar.bz2 android_system_bt-a4875a49404c544134df37022ae587a4a3321647.zip | |
resolve merge conflicts of a3ee2e35 to nyc-dev
Bug: 34946955
Change-Id: Ieff690edd3aa527a0639483ec8e1e3b661f0ecc4
Merged-In: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
| -rw-r--r-- | stack/l2cap/l2c_main.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/stack/l2cap/l2c_main.c b/stack/l2cap/l2c_main.c index dab56a24d..3c48d6974 100644 --- a/stack/l2cap/l2c_main.c +++ b/stack/l2cap/l2c_main.c @@ -28,6 +28,8 @@ #include <stdlib.h> #include <string.h> +#include <log/log.h> + #include "bt_target.h" #include "btm_int.h" #include "btu.h" @@ -132,6 +134,14 @@ void l2c_rcv_acl_data (BT_HDR *p_msg) STREAM_TO_UINT16 (hci_len, p); p_msg->offset += 4; + if (hci_len < L2CAP_PKT_OVERHEAD) { + /* Must receive at least the L2CAP length and CID */ + L2CAP_TRACE_WARNING ("L2CAP - got incorrect hci header"); + android_errorWriteLog(0x534e4554, "34946955"); + osi_free(p_msg); + return; + } + /* Extract the length and CID */ STREAM_TO_UINT16 (l2cap_len, p); STREAM_TO_UINT16 (rcv_cid, p); @@ -154,17 +164,8 @@ void l2c_rcv_acl_data (BT_HDR *p_msg) } } - if (hci_len >= L2CAP_PKT_OVERHEAD) /* Must receive at least the L2CAP length and CID.*/ - { - p_msg->len = hci_len - L2CAP_PKT_OVERHEAD; - p_msg->offset += L2CAP_PKT_OVERHEAD; - } - else - { - L2CAP_TRACE_WARNING ("L2CAP - got incorrect hci header" ); - osi_free(p_msg); - return; - } + p_msg->len = hci_len - L2CAP_PKT_OVERHEAD; + p_msg->offset += L2CAP_PKT_OVERHEAD; if (l2cap_len != p_msg->len) { |