catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-26 18:28:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

host_comm: Fix race condition in handling OUT USB transfers

Browse Source
This commit is contained in:
Harald Welte
2016-03-17 20:07:45 +01:00
parent 250cd2c062
commit 3d27c84635
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
firmware/src_simtrace/host_communication.c
View File

@@ -1,5 +1,7 @@
//#define TRACE_LEVEL 6 //#define TRACE_LEVEL 6
#include <errno.h>
#include "board.h" #include "board.h"
#include "req_ctx.h" #include "req_ctx.h"
#include "linuxlist.h" #include "linuxlist.h"
@@ -102,7 +104,11 @@ int usb_refill_from_host(struct llist_head *queue, int ep)
TRACE_DEBUG("%s (EP=%u)\r\n", __func__, ep); TRACE_DEBUG("%s (EP=%u)\r\n", __func__, ep);
rctx = req_ctx_find_get(0, RCTX_S_FREE, RCTX_S_USB_RX_BUSY); rctx = req_ctx_find_get(0, RCTX_S_FREE, RCTX_S_USB_RX_BUSY);
if (!rctx)
return -ENOMEM;
rctx->ep = ep; rctx->ep = ep;
usbep_in_progress[ep] = (uint32_t) queue;
rc = USBD_Read(ep, rctx->data, rctx->size, rc = USBD_Read(ep, rctx->data, rctx->size,
(TransferCallback) &usb_read_cb, rctx); (TransferCallback) &usb_read_cb, rctx);
@@ -110,10 +116,9 @@ int usb_refill_from_host(struct llist_head *queue, int ep)
if (rc != USBD_STATUS_SUCCESS) { if (rc != USBD_STATUS_SUCCESS) {
TRACE_ERROR("%s error %x\n", __func__, rc); TRACE_ERROR("%s error %x\n", __func__, rc);
req_ctx_put(rctx); req_ctx_put(rctx);
usbep_in_progress[ep] = 0;
return 0; return 0;
} }
usbep_in_progress[ep] = (uint32_t) queue;
return 1; return 1;
} }