diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2019-08-23 14:50:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-23 14:50:37 +0200 |
| commit | 78ded1969a3882c1a5dc9cf32ed2ffc23119a4ca (patch) | |
| tree | 2eabe73f6a050f25c51f67a8b78b061ff54d5f8e /executor | |
| parent | ca6f3cfa782bb9aa9e1cb1247a2a4632608ab368 (diff) | |
sys/linux, executor: minor USB fixes (#1361)
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/common_usb.h | 9 | ||||
| -rw-r--r-- | executor/defs.h | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/executor/common_usb.h b/executor/common_usb.h index 033bae3e6..e342d8085 100644 --- a/executor/common_usb.h +++ b/executor/common_usb.h @@ -356,11 +356,14 @@ static volatile long syz_usb_connect(volatile long a0, volatile long a1, volatil else memset(&response.data[0], 0, response_length); - debug("syz_usb_connect: reply length = %d\n", response.inner.length); - if (event.ctrl.bRequestType & USB_DIR_IN) + if (event.ctrl.bRequestType & USB_DIR_IN) { + debug("syz_usb_connect: IN, length = %d\n", response.inner.length); rv = usb_fuzzer_ep0_write(fd, (struct usb_fuzzer_ep_io*)&response); - else + } else { rv = usb_fuzzer_ep0_read(fd, (struct usb_fuzzer_ep_io*)&response); + debug("syz_usb_connect: OUT, length = %d\n", response.inner.length); + debug_dump_data(&event.data[0], response.inner.length); + } if (rv < 0) { debug("syz_usb_connect: usb_fuzzer_ep0_read/write failed with %d\n", rv); return rv; diff --git a/executor/defs.h b/executor/defs.h index d84170eae..d893a4722 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "81eea431ad9f04a17554500dc5a53d546f4158f3" +#define SYZ_REVISION "023c6ddc9587ce3e3837517f86b971f7d1f6bb9d" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -80,7 +80,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "eadfc46613ba8815e848ff6a3ecd26c74a5a5d9d" +#define SYZ_REVISION "8edfd0784a281ce59ac68505baffc9c4cc9d7549" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -90,7 +90,7 @@ #if GOARCH_arm #define GOARCH "arm" -#define SYZ_REVISION "faf2e799ef3b79e05c5270d765311edf176e3c46" +#define SYZ_REVISION "42a5a753d39a974dbbcf0a00a216aa6764bc051c" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -100,7 +100,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "6299b948875b24172e29730974c1b44a6c3c9896" +#define SYZ_REVISION "e1efc10996ca7197dc692e6e6a1034cc7c64c8ca" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -110,7 +110,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "0abb1312354a328ee0b32c04c8d51ae2d7091478" +#define SYZ_REVISION "34846d52b95c5ff856df57469682de2355a1790d" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 |