From acb51638141ff960f547431757130749bc176bc0 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 9 Aug 2019 19:46:27 +0200 Subject: sys/linux: add basic USB CDC Ethernet descriptions (#1328) --- executor/common_usb.h | 2 +- executor/defs.h | 10 +++++----- executor/syscalls.h | 10 ++++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) (limited to 'executor') diff --git a/executor/common_usb.h b/executor/common_usb.h index 94d270b4b..033bae3e6 100644 --- a/executor/common_usb.h +++ b/executor/common_usb.h @@ -336,7 +336,7 @@ static volatile long syz_usb_connect(volatile long a0, volatile long a1, volatil for (ep = 0; ep < index.eps_num; ep++) { rv = usb_fuzzer_ep_enable(fd, index.eps[ep]); if (rv < 0) { - debug("syz_usb_connect: usb_fuzzer_ep_enable failed with %d\n", rv); + debug("syz_usb_connect: usb_fuzzer_ep_enable(%d) failed with %d\n", ep, rv); } else { debug("syz_usb_connect: endpoint %d enabled\n", ep); } diff --git a/executor/defs.h b/executor/defs.h index 791739674..9e5ef7b51 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "38f83eeb8eb860a70e47d58558925a433b2db80c" +#define SYZ_REVISION "371e0b3358d1acc1064d68a603dd9747c7155064" #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 "35a61e3d9f82704660ae851088b5cab4dd788688" +#define SYZ_REVISION "25d45e1288f842c312bf4558bd60fc371f4c4afe" #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 "aa728964114f9bdcdb61227af7a3592558e9a3ab" +#define SYZ_REVISION "2de7a10048cbceeed1380db7c05fa9e2a32392dc" #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 "2436d280e9b215f342b807b6e7d340e8de10d2d0" +#define SYZ_REVISION "20122f122a095519fe4a2fea16b5b3cdb02283e8" #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 "c87d0e37e231bd4df8bbd35f06200017b89567a1" +#define SYZ_REVISION "709d6d93e25953d290a5790e96e0633e06621aba" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 diff --git a/executor/syscalls.h b/executor/syscalls.h index efc40aca1..a46146d06 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -4605,9 +4605,11 @@ const call_t syscalls[] = { {"syz_open_pts", 0, (syscall_t)syz_open_pts}, {"syz_read_part_table", 0, (syscall_t)syz_read_part_table}, {"syz_usb_connect", 0, (syscall_t)syz_usb_connect}, + {"syz_usb_connect$cdc_ethernet", 0, (syscall_t)syz_usb_connect}, {"syz_usb_connect$hid", 0, (syscall_t)syz_usb_connect}, {"syz_usb_connect$printer", 0, (syscall_t)syz_usb_connect}, {"syz_usb_control_io", 0, (syscall_t)syz_usb_control_io}, + {"syz_usb_control_io$cdc_ethernet", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_control_io$hid", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_control_io$printer", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_disconnect", 0, (syscall_t)syz_usb_disconnect}, @@ -7368,9 +7370,11 @@ const call_t syscalls[] = { {"syz_open_pts", 0, (syscall_t)syz_open_pts}, {"syz_read_part_table", 0, (syscall_t)syz_read_part_table}, {"syz_usb_connect", 0, (syscall_t)syz_usb_connect}, + {"syz_usb_connect$cdc_ethernet", 0, (syscall_t)syz_usb_connect}, {"syz_usb_connect$hid", 0, (syscall_t)syz_usb_connect}, {"syz_usb_connect$printer", 0, (syscall_t)syz_usb_connect}, {"syz_usb_control_io", 0, (syscall_t)syz_usb_control_io}, + {"syz_usb_control_io$cdc_ethernet", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_control_io$hid", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_control_io$printer", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_disconnect", 0, (syscall_t)syz_usb_disconnect}, @@ -10083,9 +10087,11 @@ const call_t syscalls[] = { {"syz_open_pts", 0, (syscall_t)syz_open_pts}, {"syz_read_part_table", 0, (syscall_t)syz_read_part_table}, {"syz_usb_connect", 0, (syscall_t)syz_usb_connect}, + {"syz_usb_connect$cdc_ethernet", 0, (syscall_t)syz_usb_connect}, {"syz_usb_connect$hid", 0, (syscall_t)syz_usb_connect}, {"syz_usb_connect$printer", 0, (syscall_t)syz_usb_connect}, {"syz_usb_control_io", 0, (syscall_t)syz_usb_control_io}, + {"syz_usb_control_io$cdc_ethernet", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_control_io$hid", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_control_io$printer", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_disconnect", 0, (syscall_t)syz_usb_disconnect}, @@ -12772,9 +12778,11 @@ const call_t syscalls[] = { {"syz_open_pts", 0, (syscall_t)syz_open_pts}, {"syz_read_part_table", 0, (syscall_t)syz_read_part_table}, {"syz_usb_connect", 0, (syscall_t)syz_usb_connect}, + {"syz_usb_connect$cdc_ethernet", 0, (syscall_t)syz_usb_connect}, {"syz_usb_connect$hid", 0, (syscall_t)syz_usb_connect}, {"syz_usb_connect$printer", 0, (syscall_t)syz_usb_connect}, {"syz_usb_control_io", 0, (syscall_t)syz_usb_control_io}, + {"syz_usb_control_io$cdc_ethernet", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_control_io$hid", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_control_io$printer", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_disconnect", 0, (syscall_t)syz_usb_disconnect}, @@ -15479,9 +15487,11 @@ const call_t syscalls[] = { {"syz_open_pts", 0, (syscall_t)syz_open_pts}, {"syz_read_part_table", 0, (syscall_t)syz_read_part_table}, {"syz_usb_connect", 0, (syscall_t)syz_usb_connect}, + {"syz_usb_connect$cdc_ethernet", 0, (syscall_t)syz_usb_connect}, {"syz_usb_connect$hid", 0, (syscall_t)syz_usb_connect}, {"syz_usb_connect$printer", 0, (syscall_t)syz_usb_connect}, {"syz_usb_control_io", 0, (syscall_t)syz_usb_control_io}, + {"syz_usb_control_io$cdc_ethernet", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_control_io$hid", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_control_io$printer", 0, (syscall_t)syz_usb_control_io}, {"syz_usb_disconnect", 0, (syscall_t)syz_usb_disconnect}, -- cgit mrf-deployment