Skip to content

[transport] usb: Fix htool crash on USB disconnect #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wak-google wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[transport] usb: Fix htool crash on USB disconnect #249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions transports/libhoth_usb_fifo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,40 @@ static int libhoth_usb_fifo_run_transfers(struct libhoth_usb_device* dev,
if (in) {
int status = libusb_submit_transfer(drvdata->in_transfer);
if (status != LIBUSB_SUCCESS) {
drvdata->all_transfers_completed = 1;
drvdata->in_transfer_completed = true;
drvdata->out_transfer_completed = true;
return status;
}
}
if (out) {
int status = libusb_submit_transfer(drvdata->out_transfer);
if (status != LIBUSB_SUCCESS) {
if (in) {
libusb_cancel_transfer(drvdata->in_transfer);
// We must still wait for the IN transfer to complete/cancel
while (drvdata->all_transfers_completed == 0) {
libusb_handle_events_completed(dev->ctx,
&drvdata->all_transfers_completed);
}
} else {
drvdata->all_transfers_completed = 1;
drvdata->out_transfer_completed = true;
}
return status;
}
}
while (drvdata->all_transfers_completed == 0) {
int status = libusb_handle_events_completed(
dev->ctx, &drvdata->all_transfers_completed);
if (status == LIBUSB_ERROR_INTERRUPTED) {
return status;
if (status != LIBUSB_SUCCESS && status != LIBUSB_ERROR_INTERRUPTED) {
// On a real error, try to cancel everything to speed up completion
if (!drvdata->in_transfer_completed) {
libusb_cancel_transfer(drvdata->in_transfer);
}
if (!drvdata->out_transfer_completed) {
libusb_cancel_transfer(drvdata->out_transfer);
}
}
}
return LIBHOTH_OK;
Expand Down Expand Up @@ -159,6 +179,9 @@ int libhoth_usb_fifo_open(struct libhoth_usb_device* dev,
goto err_out;
}
drvdata->prng_state = prng_seed;
drvdata->in_transfer_completed = true;
drvdata->out_transfer_completed = true;
drvdata->all_transfers_completed = 1;
return LIBHOTH_OK;
err_out:
if (drvdata->in_buffer != NULL) free(drvdata->in_buffer);
Expand Down
Loading