diff options
| author | Jack He <siyuanh@google.com> | 2017-04-05 17:59:58 -0700 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2017-04-24 12:19:57 -0700 |
| commit | bf4089328e505eb4dcef63303a8f5e803445f95f (patch) | |
| tree | ecd2951d0a582c17f3ca616e6c8f4c3a18d2a487 | |
| parent | c40d71a384f9572d64ab70a97d015a13e40825da (diff) | |
| download | bt-bf4089328e505eb4dcef63303a8f5e803445f95f.tar.gz | |
Check LE advertising data length before caching advertising recordsandroid-7.1.1_r49android-7.1.1_r46android-7.1.1_r43
Bug: 33899337
Test: make, receive LE advertising
Change-Id: I06b249ac5cabdef64528deda07b8bae749e1d2fd
(cherry picked from commit d57adbc350fdee4f27b82c9e39a14bd745d92320)
(cherry picked from commit 1bef3546a6cb6f05739c10825dab9eb3362892f6)
| -rw-r--r-- | stack/btm/btm_ble_gap.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/stack/btm/btm_ble_gap.c b/stack/btm/btm_ble_gap.c index 286787ea2..7fe3c99bd 100644 --- a/stack/btm/btm_ble_gap.c +++ b/stack/btm/btm_ble_gap.c @@ -28,6 +28,8 @@ #include <stdio.h> #include <stddef.h> +#include <log/log.h> + #include "bt_types.h" #include "bt_utils.h" #include "btm_ble_api.h" @@ -2285,7 +2287,7 @@ static void btm_ble_parse_adv_data(tBTM_INQ_INFO *p_info, UINT8 *p_data, ** Returns void ** *******************************************************************************/ -void btm_ble_cache_adv_data(tBTM_INQ_RESULTS *p_cur, UINT8 data_len, UINT8 *p, UINT8 evt_type) +BOOLEAN btm_ble_cache_adv_data(tBTM_INQ_RESULTS *p_cur, UINT8 data_len, UINT8 *p, UINT8 evt_type) { tBTM_BLE_INQ_CB *p_le_inq_cb = &btm_cb.ble_ctr_cb.inq_var; UINT8 *p_cache; @@ -2305,8 +2307,16 @@ void btm_ble_cache_adv_data(tBTM_INQ_RESULTS *p_cur, UINT8 data_len, UINT8 *p, U STREAM_TO_UINT8(length, p); while ( length && ((p_le_inq_cb->adv_len + length + 1) <= BTM_BLE_CACHE_ADV_DATA_MAX)) { + /* adv record size must be smaller than the total adv data size */ + if ((length + 1) > data_len) { + BTM_TRACE_ERROR("BTM - got incorrect LE advertising data"); + android_errorWriteLog(0x534e4554, "33899337"); + return FALSE; + } /* copy from the length byte & data into cache */ memcpy(p_cache, p-1, length+1); + /* reduce the total data size by size of data copied */ + data_len -= length + 1; /* advance the cache pointer past data */ p_cache += length+1; /* increment cache length */ @@ -2316,6 +2326,7 @@ void btm_ble_cache_adv_data(tBTM_INQ_RESULTS *p_cur, UINT8 data_len, UINT8 *p, U STREAM_TO_UINT8(length, p); } } + return TRUE; /* parse service UUID from adv packet and save it in inq db eir_uuid */ /* TODO */ @@ -2540,7 +2551,9 @@ BOOLEAN btm_ble_update_inq_result(tINQ_DB_ENT *p_i, UINT8 addr_type, UINT8 evt_t BTM_TRACE_WARNING("EIR data too long %d. discard", data_len); return FALSE; } - btm_ble_cache_adv_data(p_cur, data_len, p, evt_type); + if (!btm_ble_cache_adv_data(p_cur, data_len, p, evt_type)) { + return FALSE; + } p1 = (p + data_len); STREAM_TO_UINT8 (rssi, p1); |