mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-06 12:39:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

libusb: avoid use-after-free by not holding a pointer to next transfer when calling packet handler

Browse Source
This commit is contained in:
Matthias Ringwald 2019-06-12 15:51:00 +02:00
parent 0be141ae50
commit 06c6f94c1f
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
platform/libusb/hci_transport_h2_libusb.c
View File

@ -445,11 +445,11 @@ static void handle_completed_transfer(struct libusb_transfer *transfer){
int signal_done = 0; int signal_done = 0;
if (transfer->endpoint == event_in_addr) { if (transfer->endpoint == event_in_addr) {
packet_handler(HCI_EVENT_PACKET, transfer-> buffer, transfer->actual_length); packet_handler(HCI_EVENT_PACKET, transfer->buffer, transfer->actual_length);
resubmit = 1; resubmit = 1;
} else if (transfer->endpoint == acl_in_addr) { } else if (transfer->endpoint == acl_in_addr) {
// log_info("-> acl"); // log_info("-> acl");
packet_handler(HCI_ACL_DATA_PACKET, transfer-> buffer, transfer->actual_length); packet_handler(HCI_ACL_DATA_PACKET, transfer->buffer, transfer->actual_length);
resubmit = 1; resubmit = 1;
} else if (transfer->endpoint == 0){ } else if (transfer->endpoint == 0){
// log_info("command done, size %u", transfer->actual_length); // log_info("command done, size %u", transfer->actual_length);
@ -536,17 +536,16 @@ static void usb_process_ds(btstack_data_source_t *ds, btstack_data_source_callba
// Handle any packet in the order that they were received // Handle any packet in the order that they were received
while (handle_packet) { while (handle_packet) {
// log_info("handle packet %p, endpoint %x, status %x", handle_packet, handle_packet->endpoint, handle_packet->status); // log_info("handle packet %p, endpoint %x, status %x", handle_packet, handle_packet->endpoint, handle_packet->status);
void * next = handle_packet->user_data;
handle_completed_transfer(handle_packet); // pop next transfer
struct libusb_transfer * transfer = handle_packet;
handle_packet = (struct libusb_transfer*) handle_packet->user_data;
// handle transfer
handle_completed_transfer(transfer);
// handle case where libusb_close might be called by hci packet handler // handle case where libusb_close might be called by hci packet handler
if (libusb_state != LIB_USB_TRANSFERS_ALLOCATED) return; if (libusb_state != LIB_USB_TRANSFERS_ALLOCATED) return;
// Move to next in the list of packets to handle
if (next) {
handle_packet = (struct libusb_transfer*)next;
} else {
handle_packet = NULL;
}
} }
// log_info("end usb_process_ds"); // log_info("end usb_process_ds");
} }