From d545e945ce3761556e10fd6b4c20a952c0e821a1 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Wed, 7 Aug 2019 18:03:59 +0200 Subject: sys/linux: add syz_open_dev$char_usb descriptions syz_open_dev$char_usb opens char devices with major = USB_MAJOR. Sanitize its values to make sure it doesn't open other char/block devices. --- executor/defs.h | 10 +++++----- executor/syscalls.h | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) (limited to 'executor') diff --git a/executor/defs.h b/executor/defs.h index 9cedad6cb..4480e20e2 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "eb22b8a389910e3ec878475738f280bd61b00a09" +#define SYZ_REVISION "38f83eeb8eb860a70e47d58558925a433b2db80c" #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 "b025d70b7713cc48e9ab783fc35e2410b69a5736" +#define SYZ_REVISION "35a61e3d9f82704660ae851088b5cab4dd788688" #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 "fdb9cb5b71481f79ff86d824721def50b72fafa5" +#define SYZ_REVISION "aa728964114f9bdcdb61227af7a3592558e9a3ab" #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 "26a51558327902a8e8951bd6afdcdae046006802" +#define SYZ_REVISION "2436d280e9b215f342b807b6e7d340e8de10d2d0" #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 "d118414cc10f2c07b6a9e1fae0e14db998375343" +#define SYZ_REVISION "c87d0e37e231bd4df8bbd35f06200017b89567a1" #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 a4cfbe18d..31859ff91 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -3932,6 +3932,7 @@ const call_t syscalls[] = { {"read", 3}, {"read$FUSE", 3}, {"read$alg", 3}, + {"read$char_usb", 3}, {"read$eventfd", 3}, {"read$hiddev", 3}, {"read$hidraw", 3}, @@ -4561,6 +4562,7 @@ const call_t syscalls[] = { {"syz_open_dev$audion", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$binder", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$cec", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$char_usb", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dmmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dri", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dricontrol", 0, (syscall_t)syz_open_dev}, @@ -4790,6 +4792,7 @@ const call_t syscalls[] = { {"write$cgroup_pid", 4}, {"write$cgroup_subtree", 4}, {"write$cgroup_type", 4}, + {"write$char_usb", 4}, {"write$evdev", 4}, {"write$eventfd", 4}, {"write$hidraw", 4}, @@ -6691,6 +6694,7 @@ const call_t syscalls[] = { {"read", 0}, {"read$FUSE", 0}, {"read$alg", 0}, + {"read$char_usb", 0}, {"read$eventfd", 0}, {"read$hiddev", 0}, {"read$hidraw", 0}, @@ -7321,6 +7325,7 @@ const call_t syscalls[] = { {"syz_open_dev$audion", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$binder", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$cec", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$char_usb", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dmmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dri", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dricontrol", 0, (syscall_t)syz_open_dev}, @@ -7550,6 +7555,7 @@ const call_t syscalls[] = { {"write$cgroup_pid", 1}, {"write$cgroup_subtree", 1}, {"write$cgroup_type", 1}, + {"write$char_usb", 1}, {"write$evdev", 1}, {"write$eventfd", 1}, {"write$hidraw", 1}, @@ -9405,6 +9411,7 @@ const call_t syscalls[] = { {"read", 3}, {"read$FUSE", 3}, {"read$alg", 3}, + {"read$char_usb", 3}, {"read$eventfd", 3}, {"read$hiddev", 3}, {"read$hidraw", 3}, @@ -10033,6 +10040,7 @@ const call_t syscalls[] = { {"syz_open_dev$audion", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$binder", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$cec", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$char_usb", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dmmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dri", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dricontrol", 0, (syscall_t)syz_open_dev}, @@ -10260,6 +10268,7 @@ const call_t syscalls[] = { {"write$cgroup_pid", 4}, {"write$cgroup_subtree", 4}, {"write$cgroup_type", 4}, + {"write$char_usb", 4}, {"write$evdev", 4}, {"write$eventfd", 4}, {"write$hidraw", 4}, @@ -12100,6 +12109,7 @@ const call_t syscalls[] = { {"read", 63}, {"read$FUSE", 63}, {"read$alg", 63}, + {"read$char_usb", 63}, {"read$eventfd", 63}, {"read$hiddev", 63}, {"read$hidraw", 63}, @@ -12719,6 +12729,7 @@ const call_t syscalls[] = { {"syz_open_dev$audion", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$binder", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$cec", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$char_usb", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dmmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dri", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dricontrol", 0, (syscall_t)syz_open_dev}, @@ -12942,6 +12953,7 @@ const call_t syscalls[] = { {"write$cgroup_pid", 64}, {"write$cgroup_subtree", 64}, {"write$cgroup_type", 64}, + {"write$char_usb", 64}, {"write$evdev", 64}, {"write$eventfd", 64}, {"write$hidraw", 64}, @@ -14796,6 +14808,7 @@ const call_t syscalls[] = { {"read", 3}, {"read$FUSE", 3}, {"read$alg", 3}, + {"read$char_usb", 3}, {"read$eventfd", 3}, {"read$hiddev", 3}, {"read$hidraw", 3}, @@ -15423,6 +15436,7 @@ const call_t syscalls[] = { {"syz_open_dev$audion", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$binder", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$cec", 0, (syscall_t)syz_open_dev}, + {"syz_open_dev$char_usb", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dmmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dri", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$dricontrol", 0, (syscall_t)syz_open_dev}, @@ -15652,6 +15666,7 @@ const call_t syscalls[] = { {"write$cgroup_pid", 4}, {"write$cgroup_subtree", 4}, {"write$cgroup_type", 4}, + {"write$char_usb", 4}, {"write$evdev", 4}, {"write$eventfd", 4}, {"write$hidraw", 4}, -- cgit mrf-deployment