osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

btle: Initialise acl_data to avoid wild pointer dereference 

Close oss-fuzz issue 25007.
This commit is contained in:
lutianxiong 2020-11-18 09:23:45 +08:00 committed by Wireshark GitLab Utility
parent 7654bb260d
commit 65ac14b51a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-btle.c
View File

@ -1634,6 +1634,8 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
acl_data->remote_bd_addr_id = 0;
acl_data->is_btle = TRUE;
acl_data->is_btle_retransmit = retransmit;
acl_data->adapter_disconnect_in_frame = &max_disconnect_in_frame;
acl_data->disconnect_in_frame = &max_disconnect_in_frame;
next_tvb = tvb_new_subset_length(tvb, offset, length);
if (next_tvb) {
@ -1715,6 +1717,8 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
acl_data->remote_bd_addr_id = 0;
acl_data->is_btle = TRUE;
acl_data->is_btle_retransmit = retransmit;
acl_data->adapter_disconnect_in_frame = &max_disconnect_in_frame;
acl_data->disconnect_in_frame = &max_disconnect_in_frame;
next_tvb = tvb_new_subset_length(tvb, offset, length);
call_dissector_with_data(btl2cap_handle, next_tvb, pinfo, tree, acl_data);