diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2020-03-13 00:32:32 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-03-13 07:44:43 +0100 |
| commit | d89275f2aaa8ae95a2bcb8e8f8b022708d2d6951 (patch) | |
| tree | 9dd63965cdab5e5e3e3d041fa39aba4072d57a50 /executor/common_linux.h | |
| parent | d850e9d08467726cd94b6a9caaf8090c594721ba (diff) | |
executor, sys/linux: add ath9k usb descriptions
Among other things this changes timeout for USB programs from 2 to 3 seconds.
ath9k fuzzing also requires ath9k firmware to be present, so system images
need to be regenerated with the updated script.
Diffstat (limited to 'executor/common_linux.h')
| -rw-r--r-- | executor/common_linux.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index ef071e9be..b62878f3c 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -72,7 +72,8 @@ static int event_timedwait(event_t* ev, uint64 timeout) #if SYZ_EXECUTOR || SYZ_REPEAT || SYZ_NET_INJECTION || SYZ_FAULT || SYZ_SANDBOX_NONE || \ SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE || SYZ_SANDBOX_ANDROID || \ - SYZ_FAULT || SYZ_LEAK || SYZ_BINFMT_MISC || (__NR_syz_usb_connect && USB_DEBUG) + SYZ_FAULT || SYZ_LEAK || SYZ_BINFMT_MISC || \ + ((__NR_syz_usb_connect || __NR_syz_usb_connect_ath9k) && USB_DEBUG) #include <errno.h> #include <fcntl.h> #include <stdarg.h> @@ -1443,11 +1444,11 @@ static long syz_extract_tcp_res(volatile long a0, volatile long a1, volatile lon } #endif -#if SYZ_EXECUTOR || SYZ_CLOSE_FDS || __NR_syz_usb_connect +#if SYZ_EXECUTOR || SYZ_CLOSE_FDS || __NR_syz_usb_connect || __NR_syz_usb_connect_ath9k #define MAX_FDS 30 #endif -#if SYZ_EXECUTOR || __NR_syz_usb_connect +#if SYZ_EXECUTOR || __NR_syz_usb_connect || __NR_syz_usb_connect_ath9k #include <errno.h> #include <fcntl.h> #include <linux/usb/ch9.h> |