From ef871b2e4ff7b6a8f84a6a0a0fd3e9c3ed8e67b4 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sun, 22 Mar 2020 12:21:51 +0100 Subject: sys/linux: don't use syz_open_dev when openat is enough --- executor/defs.h | 12 ++++++------ executor/syscalls.h | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 30 insertions(+), 30 deletions(-) (limited to 'executor') diff --git a/executor/defs.h b/executor/defs.h index 12944e62c..20cb0957a 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "60af2b3f1fd44c07d3294e10ea57f6916f180001" +#define SYZ_REVISION "873172817a75c81835969c440f232721601a7e13" #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 "d62abdd787789af27199dbec905bbea4094dd8c5" +#define SYZ_REVISION "670a1e865c0bc7d60e9886acf4666ee3677e346e" #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 "875cfb89c942f02005c85528bc68e9b5b84754da" +#define SYZ_REVISION "2acbffd4e98df57974fbda9a9c4c9430f308ca4b" #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 "19bcd4a40d193dfd39e44f26305bbafe4a711044" +#define SYZ_REVISION "1cd77b584307efb2405e0d88b55e10dce8803d4b" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -110,7 +110,7 @@ #if GOARCH_mips64le #define GOARCH "mips64le" -#define SYZ_REVISION "84f77132adefbe37938e54613dd8f97edd5342f0" +#define SYZ_REVISION "27db5f8e0ad7e7466d8fee26159a8361a0e6366f" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -120,7 +120,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "5a77ff0b619f079c3852b11b60caf2e4963ee08a" +#define SYZ_REVISION "2efe0bc0e3fe08437712654ac1ed750ccb17190f" #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 054c62f0b..7dedcdd0c 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -3993,6 +3993,7 @@ const call_t syscalls[] = { {"openat$lightnvm", 295}, {"openat$loop_ctrl", 295}, {"openat$md", 295}, + {"openat$mice", 295}, {"openat$misdntimer", 295}, {"openat$mixer", 295}, {"openat$ndctl0", 295}, @@ -4056,9 +4057,12 @@ const call_t syscalls[] = { {"openat$smackfs_syslog", 295}, {"openat$smackfs_unconfined", 295}, {"openat$snapshot", 295}, + {"openat$sndseq", 295}, + {"openat$sndtimer", 295}, {"openat$sr", 295}, {"openat$sw_sync", 295}, {"openat$thread_pidfd", 295}, + {"openat$tlk_device", 295}, {"openat$trusty", 295}, {"openat$trusty_avb", 295}, {"openat$trusty_gatekeeper", 295}, @@ -5101,7 +5105,6 @@ const call_t syscalls[] = { {"syz_open_dev$ircomm", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$loop", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$media", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$mice", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$midi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mouse", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ndb", 0, (syscall_t)syz_open_dev}, @@ -5114,10 +5117,7 @@ const call_t syscalls[] = { {"syz_open_dev$sndmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$sndpcmc", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$sndpcmp", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$sndseq", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$sndtimer", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$swradio", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$tlk_device", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tty1", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tty20", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ttys", 0, (syscall_t)syz_open_dev}, @@ -7346,6 +7346,7 @@ const call_t syscalls[] = { {"openat$lightnvm", 257}, {"openat$loop_ctrl", 257}, {"openat$md", 257}, + {"openat$mice", 257}, {"openat$misdntimer", 257}, {"openat$mixer", 257}, {"openat$ndctl0", 257}, @@ -7409,9 +7410,12 @@ const call_t syscalls[] = { {"openat$smackfs_syslog", 257}, {"openat$smackfs_unconfined", 257}, {"openat$snapshot", 257}, + {"openat$sndseq", 257}, + {"openat$sndtimer", 257}, {"openat$sr", 257}, {"openat$sw_sync", 257}, {"openat$thread_pidfd", 257}, + {"openat$tlk_device", 257}, {"openat$trusty", 257}, {"openat$trusty_avb", 257}, {"openat$trusty_gatekeeper", 257}, @@ -8454,7 +8458,6 @@ const call_t syscalls[] = { {"syz_open_dev$ircomm", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$loop", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$media", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$mice", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$midi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mouse", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ndb", 0, (syscall_t)syz_open_dev}, @@ -8467,10 +8470,7 @@ const call_t syscalls[] = { {"syz_open_dev$sndmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$sndpcmc", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$sndpcmp", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$sndseq", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$sndtimer", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$swradio", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$tlk_device", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tty1", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tty20", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ttys", 0, (syscall_t)syz_open_dev}, @@ -10652,6 +10652,7 @@ const call_t syscalls[] = { {"openat$lightnvm", 322}, {"openat$loop_ctrl", 322}, {"openat$md", 322}, + {"openat$mice", 322}, {"openat$misdntimer", 322}, {"openat$mixer", 322}, {"openat$ndctl0", 322}, @@ -10715,9 +10716,12 @@ const call_t syscalls[] = { {"openat$smackfs_syslog", 322}, {"openat$smackfs_unconfined", 322}, {"openat$snapshot", 322}, + {"openat$sndseq", 322}, + {"openat$sndtimer", 322}, {"openat$sr", 322}, {"openat$sw_sync", 322}, {"openat$thread_pidfd", 322}, + {"openat$tlk_device", 322}, {"openat$trusty", 322}, {"openat$trusty_avb", 322}, {"openat$trusty_gatekeeper", 322}, @@ -11759,7 +11763,6 @@ const call_t syscalls[] = { {"syz_open_dev$ircomm", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$loop", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$media", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$mice", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$midi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mouse", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ndb", 0, (syscall_t)syz_open_dev}, @@ -11772,10 +11775,7 @@ const call_t syscalls[] = { {"syz_open_dev$sndmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$sndpcmc", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$sndpcmp", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$sndseq", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$sndtimer", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$swradio", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$tlk_device", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tty1", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tty20", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ttys", 0, (syscall_t)syz_open_dev}, @@ -13944,6 +13944,7 @@ const call_t syscalls[] = { {"openat$lightnvm", 56}, {"openat$loop_ctrl", 56}, {"openat$md", 56}, + {"openat$mice", 56}, {"openat$misdntimer", 56}, {"openat$mixer", 56}, {"openat$ndctl0", 56}, @@ -14007,9 +14008,12 @@ const call_t syscalls[] = { {"openat$smackfs_syslog", 56}, {"openat$smackfs_unconfined", 56}, {"openat$snapshot", 56}, + {"openat$sndseq", 56}, + {"openat$sndtimer", 56}, {"openat$sr", 56}, {"openat$sw_sync", 56}, {"openat$thread_pidfd", 56}, + {"openat$tlk_device", 56}, {"openat$trusty", 56}, {"openat$trusty_avb", 56}, {"openat$trusty_gatekeeper", 56}, @@ -15038,7 +15042,6 @@ const call_t syscalls[] = { {"syz_open_dev$ircomm", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$loop", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$media", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$mice", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$midi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mouse", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ndb", 0, (syscall_t)syz_open_dev}, @@ -15051,10 +15054,7 @@ const call_t syscalls[] = { {"syz_open_dev$sndmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$sndpcmc", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$sndpcmp", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$sndseq", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$sndtimer", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$swradio", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$tlk_device", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tty1", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tty20", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ttys", 0, (syscall_t)syz_open_dev}, @@ -17130,6 +17130,7 @@ const call_t syscalls[] = { {"openat$lightnvm", 5247}, {"openat$loop_ctrl", 5247}, {"openat$md", 5247}, + {"openat$mice", 5247}, {"openat$misdntimer", 5247}, {"openat$mixer", 5247}, {"openat$ndctl0", 5247}, @@ -17193,9 +17194,12 @@ const call_t syscalls[] = { {"openat$smackfs_syslog", 5247}, {"openat$smackfs_unconfined", 5247}, {"openat$snapshot", 5247}, + {"openat$sndseq", 5247}, + {"openat$sndtimer", 5247}, {"openat$sr", 5247}, {"openat$sw_sync", 5247}, {"openat$thread_pidfd", 5247}, + {"openat$tlk_device", 5247}, {"openat$trusty", 5247}, {"openat$trusty_avb", 5247}, {"openat$trusty_gatekeeper", 5247}, @@ -18237,7 +18241,6 @@ const call_t syscalls[] = { {"syz_open_dev$ircomm", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$loop", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$media", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$mice", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$midi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mouse", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ndb", 0, (syscall_t)syz_open_dev}, @@ -18250,10 +18253,7 @@ const call_t syscalls[] = { {"syz_open_dev$sndmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$sndpcmc", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$sndpcmp", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$sndseq", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$sndtimer", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$swradio", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$tlk_device", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tty1", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tty20", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ttys", 0, (syscall_t)syz_open_dev}, @@ -20437,6 +20437,7 @@ const call_t syscalls[] = { {"openat$lightnvm", 286}, {"openat$loop_ctrl", 286}, {"openat$md", 286}, + {"openat$mice", 286}, {"openat$misdntimer", 286}, {"openat$mixer", 286}, {"openat$ndctl0", 286}, @@ -20500,9 +20501,12 @@ const call_t syscalls[] = { {"openat$smackfs_syslog", 286}, {"openat$smackfs_unconfined", 286}, {"openat$snapshot", 286}, + {"openat$sndseq", 286}, + {"openat$sndtimer", 286}, {"openat$sr", 286}, {"openat$sw_sync", 286}, {"openat$thread_pidfd", 286}, + {"openat$tlk_device", 286}, {"openat$trusty", 286}, {"openat$trusty_avb", 286}, {"openat$trusty_gatekeeper", 286}, @@ -21542,7 +21546,6 @@ const call_t syscalls[] = { {"syz_open_dev$ircomm", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$loop", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$media", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$mice", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$midi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$mouse", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ndb", 0, (syscall_t)syz_open_dev}, @@ -21555,10 +21558,7 @@ const call_t syscalls[] = { {"syz_open_dev$sndmidi", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$sndpcmc", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$sndpcmp", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$sndseq", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$sndtimer", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$swradio", 0, (syscall_t)syz_open_dev}, - {"syz_open_dev$tlk_device", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tty1", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$tty20", 0, (syscall_t)syz_open_dev}, {"syz_open_dev$ttys", 0, (syscall_t)syz_open_dev}, -- cgit mrf-deployment