openocd-org/openocd
1
0
Fork 0
mirror of https://github.com/openocd-org/openocd.git synced 2025-10-14 02:58:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmsis-dap: Fix freeing pending transfers on close

Browse Source 
Freeing pending transfers on shutdown is done in openOCD
and on libusb side. This created concurrency in freeing
memory and segmentation faults:
https://github.com/libusb/libusb/issues/1627
Bug is reproduced better if many targets are laucnhed.
Bug was reproduced with CMSIS-DAP on targets:
cyw20829, psoc4, stm32l5 if launching multiple times.
Proposed working fix: if some transfers pending/in-flight
on 'shutdown' then apply libusb_handle_events_timeout_completed()
to make transfer complete. In all cases transfer completed
due to tests.

Change-Id: I44621ac6096791714910220d04614d0a19ce47bd
Signed-off-by: kryvosheiaivan <Ivan.Kryvosheia@infineon.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/8876
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
kryvosheiaivan
2025-05-28 16:52:42 +03:00
committed by Antonio Borneo
parent 207ecaab33
commit 8046f2a38f
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/jtag/drivers/cmsis_dap_usb_bulk.c
View File

@@ -414,7 +414,19 @@ static int cmsis_dap_usb_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t p
static void cmsis_dap_usb_close(struct cmsis_dap *dap)
{
for (unsigned int i = 0; i < MAX_PENDING_REQUESTS; i++) {
libusb_free_transfer(dap->bdata->command_transfers[i].transfer);
if (dap->bdata->command_transfers[i].status == CMSIS_DAP_TRANSFER_PENDING) {
LOG_DEBUG("busy command USB transfer at %u", dap->pending_fifo_put_idx);
struct timeval tv = {
.tv_sec = 1,
.tv_usec = 1000
};
/* Complete pending commands */
int res = libusb_handle_events_timeout_completed(dap->bdata->usb_ctx, &tv, NULL);
if (res == 0)
libusb_free_transfer(dap->bdata->command_transfers[i].transfer);
} else {
libusb_free_transfer(dap->bdata->command_transfers[i].transfer);
}
libusb_free_transfer(dap->bdata->response_transfers[i].transfer);
}
cmsis_dap_usb_free(dap);