aboutsummaryrefslogtreecommitdiffstats
path: root/executor/common_usb_netbsd.h
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2020-07-13 16:37:36 +0200
committerDmitry Vyukov <dvyukov@google.com>2020-07-15 09:26:23 +0200
commit13d5e89e029784d9dba5e93d3be71af08cdfd502 (patch)
tree49a4e42f8043e2c447f3e3e3c12002dae2adbf93 /executor/common_usb_netbsd.h
parentb458f2c1a61c78e2004be6b4ef60b45fb81bd684 (diff)
executor: remove NONFAILING from pseudo-syscalls
This is not needed anymore afer the previous commit. Fixes #1918
Diffstat (limited to 'executor/common_usb_netbsd.h')
-rw-r--r--executor/common_usb_netbsd.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/executor/common_usb_netbsd.h b/executor/common_usb_netbsd.h
index 9ce8f72dc..af73e19c4 100644
--- a/executor/common_usb_netbsd.h
+++ b/executor/common_usb_netbsd.h
@@ -243,7 +243,7 @@ static volatile long syz_usb_connect_impl(uint64 speed, uint64 dev_len,
debug("syz_usb_connect: add_usb_index success\n");
#if USB_DEBUG
- NONFAILING(analyze_usb_device(index));
+ analyze_usb_device(index);
#endif
rv = vhci_setport(fd, 1);
@@ -285,9 +285,7 @@ static volatile long syz_usb_connect_impl(uint64 speed, uint64 dev_len,
char data[4096];
if (req.u.ctrl.bmRequestType & UE_DIR_IN) {
- bool response_found = false;
- NONFAILING(response_found = lookup_connect_response_in(fd, descs, (const struct usb_ctrlrequest*)&req.u.ctrl, &response_data, &response_length));
- if (!response_found) {
+ if (!lookup_connect_response_in(fd, descs, (const struct usb_ctrlrequest*)&req.u.ctrl, &response_data, &response_length)) {
debug("syz_usb_connect: unknown control IN request\n");
goto err;
}