mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-03 01:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

assert correct packet size for received ACL and event packets

Browse Source
This commit is contained in:
mila@ringwald.ch 2013-11-22 12:49:34 +00:00
parent ce6765104d
commit e76a89ee0a
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hci.c
View File

@ -272,6 +272,8 @@ int hci_send_acl_packet(uint8_t *packet, int size){
static void acl_handler(uint8_t *packet, int size){ static void acl_handler(uint8_t *packet, int size){
// log_info("acl_handler: size %u", size);
// get info // get info
hci_con_handle_t con_handle = READ_ACL_CONNECTION_HANDLE(packet); hci_con_handle_t con_handle = READ_ACL_CONNECTION_HANDLE(packet);
hci_connection_t *conn = hci_connection_for_handle(con_handle); hci_connection_t *conn = hci_connection_for_handle(con_handle);
@ -284,6 +286,12 @@ static void acl_handler(uint8_t *packet, int size){
return; return;
} }
// assert packet is complete
if (acl_length != size + 4){
log_error("hci.c: acl_handler called with ACL packet of wrong size %u, expected %u => dropping packet", size, acl_length + 4);
return;
}
// update idle timestamp // update idle timestamp
hci_connection_timestamp(conn); hci_connection_timestamp(conn);
@ -326,7 +334,7 @@ static void acl_handler(uint8_t *packet, int size){
// peek into L2CAP packet! // peek into L2CAP packet!
uint16_t l2cap_length = READ_L2CAP_LENGTH( packet ); uint16_t l2cap_length = READ_L2CAP_LENGTH( packet );
// log_error( "ACL First Fragment: acl_len %u, l2cap_len %u\n", acl_length, l2cap_length); // log_info( "ACL First Fragment: acl_len %u, l2cap_len %u\n", acl_length, l2cap_length);
// compare fragment size to L2CAP packet size // compare fragment size to L2CAP packet size
if (acl_length >= l2cap_length + 4){ if (acl_length >= l2cap_length + 4){
@ -451,6 +459,15 @@ int hci_le_supported(void){
static device_name_t device_name; static device_name_t device_name;
#endif #endif
static void event_handler(uint8_t *packet, int size){ static void event_handler(uint8_t *packet, int size){
uint16_t event_length = packet[1];
// assert packet is complete
if (size != event_length + 2){
log_error("hci.c: event_handler called with event packet of wrong size %u, expected %u => dropping packet", size, event_length + 2);
return;
}
bd_addr_t addr; bd_addr_t addr;
uint8_t link_type; uint8_t link_type;
hci_con_handle_t handle; hci_con_handle_t handle;