From 0d298d6b2e4a48a2b4d3413cabc199e5f61c1dd4 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Wed, 14 Aug 2019 21:05:27 +0200 Subject: sys/linux: add basic USB CDC NCM descriptions (#1337) CDC NCM support is incomplete, as it requires support for describing multiples interfaces per configuration. --- executor/defs.h | 10 +++++----- executor/syscalls.h | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'executor') diff --git a/executor/defs.h b/executor/defs.h index 010dea8ae..cf02ca9f8 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "721a080105148cf21f56469347ad81438d267294" +#define SYZ_REVISION "2674710f03983d53bfce0c3f384547610c9c0b71" #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 "fe52d15be441ed4eb3dfdef8d296b6a018a69d64" +#define SYZ_REVISION "ab460a9ed70cb8e18613d4040a8a8c2978fd7fa7" #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 "2298050016e86a707e03327da76e19f07109b759" +#define SYZ_REVISION "0dda4f05b8ba8d6e91baca411d16d5ae0fc06fde" #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 "60f11f912f027bd7172bce8110d4410747071d48" +#define SYZ_REVISION "6089eb29343fc969b9fcf2da3952a6ae2528ea1f" #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 "c44b6b364c6bda2b384ec760ae7c273cb4e6a295" +#define SYZ_REVISION "952802d798e1a60ee50b8d1c351dc02183b0cef1" #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 bdc31762a..12934de75 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -4576,10 +4576,12 @@ const call_t syscalls[] = { {"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$cdc_ncm", 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$cdc_ncm", 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}, @@ -7341,10 +7343,12 @@ const call_t syscalls[] = { {"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$cdc_ncm", 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$cdc_ncm", 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}, @@ -10058,10 +10062,12 @@ const call_t syscalls[] = { {"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$cdc_ncm", 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$cdc_ncm", 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}, @@ -12749,10 +12755,12 @@ const call_t syscalls[] = { {"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$cdc_ncm", 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$cdc_ncm", 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}, @@ -15458,10 +15466,12 @@ const call_t syscalls[] = { {"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$cdc_ncm", 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$cdc_ncm", 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