Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-dev am: aa754ed3ec
Change-Id: I2cc0a9befe3c2b0412d53bad6b7790e61119cae2
diff --git a/stack/btm/btm_acl.cc b/stack/btm/btm_acl.cc
index e3b132d..07a80fb 100644
--- a/stack/btm/btm_acl.cc
+++ b/stack/btm/btm_acl.cc
@@ -47,7 +47,6 @@
#include "device/include/interop.h"
#include "hcidefs.h"
#include "hcimsgs.h"
-#include "log/log.h"
#include "l2c_int.h"
#include "osi/include/osi.h"
@@ -1077,7 +1076,7 @@
* Returns void
*
******************************************************************************/
-void btm_read_remote_ext_features_complete(uint8_t* p, uint8_t evt_len) {
+void btm_read_remote_ext_features_complete(uint8_t* p) {
tACL_CONN* p_acl_cb;
uint8_t page_num, max_page;
uint16_t handle;
@@ -1085,14 +1084,6 @@
BTM_TRACE_DEBUG("btm_read_remote_ext_features_complete");
- if (evt_len < HCI_EXT_FEATURES_SUCCESS_EVT_LEN) {
- android_errorWriteLog(0x534e4554, "141552859");
- BTM_TRACE_ERROR(
- "btm_read_remote_ext_features_complete evt length too short. length=%d",
- evt_len);
- return;
- }
-
++p;
STREAM_TO_UINT16(handle, p);
STREAM_TO_UINT8(page_num, p);
@@ -1112,13 +1103,6 @@
return;
}
- if (page_num > max_page) {
- android_errorWriteLog(0x534e4554, "141552859");
- BTM_TRACE_ERROR("btm_read_remote_ext_features_complete num_page=%d invalid",
- page_num);
- return;
- }
-
p_acl_cb = &btm_cb.acl_db[acl_idx];
/* Copy the received features page */
diff --git a/stack/btm/btm_int.h b/stack/btm/btm_int.h
index 1abb2be..a71af77 100644
--- a/stack/btm/btm_int.h
+++ b/stack/btm/btm_int.h
@@ -112,7 +112,7 @@
extern uint16_t btm_get_acl_disc_reason_code(void);
extern tBTM_STATUS btm_remove_acl(BD_ADDR bd_addr, tBT_TRANSPORT transport);
extern void btm_read_remote_features_complete(uint8_t* p);
-extern void btm_read_remote_ext_features_complete(uint8_t* p, uint8_t evt_len);
+extern void btm_read_remote_ext_features_complete(uint8_t* p);
extern void btm_read_remote_ext_features_failed(uint8_t status,
uint16_t handle);
extern void btm_read_remote_version_complete(uint8_t* p);
diff --git a/stack/btu/btu_hcif.cc b/stack/btu/btu_hcif.cc
index 1456228..144e36c 100644
--- a/stack/btu/btu_hcif.cc
+++ b/stack/btu/btu_hcif.cc
@@ -69,8 +69,7 @@
static void btu_hcif_rmt_name_request_comp_evt(uint8_t* p, uint16_t evt_len);
static void btu_hcif_encryption_change_evt(uint8_t* p);
static void btu_hcif_read_rmt_features_comp_evt(uint8_t* p);
-static void btu_hcif_read_rmt_ext_features_comp_evt(uint8_t* p,
- uint8_t evt_len);
+static void btu_hcif_read_rmt_ext_features_comp_evt(uint8_t* p);
static void btu_hcif_read_rmt_version_comp_evt(uint8_t* p);
static void btu_hcif_qos_setup_comp_evt(uint8_t* p);
static void btu_hcif_command_complete_evt(BT_HDR* response, void* context);
@@ -194,7 +193,7 @@
btu_hcif_read_rmt_features_comp_evt(p);
break;
case HCI_READ_RMT_EXT_FEATURES_COMP_EVT:
- btu_hcif_read_rmt_ext_features_comp_evt(p, hci_evt_len);
+ btu_hcif_read_rmt_ext_features_comp_evt(p);
break;
case HCI_READ_RMT_VERSION_COMP_EVT:
btu_hcif_read_rmt_version_comp_evt(p);
@@ -750,8 +749,7 @@
* Returns void
*
******************************************************************************/
-static void btu_hcif_read_rmt_ext_features_comp_evt(uint8_t* p,
- uint8_t evt_len) {
+static void btu_hcif_read_rmt_ext_features_comp_evt(uint8_t* p) {
uint8_t* p_cur = p;
uint8_t status;
uint16_t handle;
@@ -759,7 +757,7 @@
STREAM_TO_UINT8(status, p_cur);
if (status == HCI_SUCCESS)
- btm_read_remote_ext_features_complete(p, evt_len);
+ btm_read_remote_ext_features_complete(p);
else {
STREAM_TO_UINT16(handle, p_cur);
btm_read_remote_ext_features_failed(status, handle);
diff --git a/stack/include/hcidefs.h b/stack/include/hcidefs.h
index fbaba54..ae7ec87 100644
--- a/stack/include/hcidefs.h
+++ b/stack/include/hcidefs.h
@@ -1567,8 +1567,6 @@
#define HCI_FEATURE_BYTES_PER_PAGE 8
-#define HCI_EXT_FEATURES_SUCCESS_EVT_LEN 13
-
#define HCI_FEATURES_KNOWN(x) \
(((x)[0] | (x)[1] | (x)[2] | (x)[3] | (x)[4] | (x)[5] | (x)[6] | (x)[7]) != 0)
