From 13d5e89e029784d9dba5e93d3be71af08cdfd502 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 13 Jul 2020 16:37:36 +0200 Subject: executor: remove NONFAILING from pseudo-syscalls This is not needed anymore afer the previous commit. Fixes #1918 --- executor/common_usb_netbsd.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'executor/common_usb_netbsd.h') 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; } -- cgit mrf-deployment