diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2019-11-03 15:00:15 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-11-03 15:00:15 +0100 |
| commit | 99d946ccff4e757395f5607f06645c79c2c951df (patch) | |
| tree | c7234fee2110e4aeab8a637e15a0d1251f933ce7 /executor | |
| parent | 2079602763074ecfff9e9793649fc215faf7a5e1 (diff) | |
executor: fix setup of vxcan
Adding vxcan1 also adds vxcan0. Setup and use both.
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/common_linux.h | 3 | ||||
| -rw-r--r-- | executor/defs.h | 10 | ||||
| -rw-r--r-- | executor/syscalls.h | 5 |
3 files changed, 7 insertions, 11 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index 0b7e15a63..5dbd5a56c 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -587,7 +587,7 @@ static void initialize_netdevices(void) {"nlmon", "nlmon0"}, {"caif", "caif0"}, {"batadv", "batadv0"}, - // Note: adding device vxcan0 fails. + // Note: this adds vxcan0/vxcan1 pair, similar to veth (creating vxcan0 would fail). {"vxcan", "vxcan1"}, // Note: netdevsim devices can't have the same name even in different namespaces. {"netdevsim", netdevsim}, @@ -629,6 +629,7 @@ static void initialize_netdevices(void) {"hsr0", 0}, {"dummy0", ETH_ALEN}, {"nlmon0", 0}, + {"vxcan0", 0, true}, {"vxcan1", 0, true}, {"caif0", ETH_ALEN}, // TODO: up'ing caif fails with ENODEV {"batadv0", ETH_ALEN}, diff --git a/executor/defs.h b/executor/defs.h index 33621fc51..06a9fc177 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "e5c0001ae260a81ee59974b5ad110c196326f3f7" +#define SYZ_REVISION "0ec7f090a895cf82ab41a46e65c69b4454e26ea2" #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 "50b907b28392ade8f795f8f88990d3cb84ab2ef5" +#define SYZ_REVISION "89d58cbf2acf0a284a5f6f4dc2c1f64cd035bee9" #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 "dfba12b4edeeb95d08f357872fac2de65eaeb841" +#define SYZ_REVISION "24b24c9036bf2c83200993105d47e6e8d52824f1" #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 "a65fefc4d3a3550aecb837013bc8f74ba7513dce" +#define SYZ_REVISION "0df8c4d230ccd81a645a3cda06fbe0fed41c416e" #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 "14eab01bd82692d4bd4d4047ed3cc79341917e90" +#define SYZ_REVISION "c9dc2f5a65994c872d1ae9542e74f45d95396bde" #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 d9a52e43f..8fad52067 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -3523,7 +3523,6 @@ const call_t syscalls[] = { {"ioctl$VT_WAITACTIVE", 54}, {"ioctl$ifreq_SIOCGIFINDEX_team", 54}, {"ioctl$ifreq_SIOCGIFINDEX_vcan", 54}, - {"ioctl$ifreq_SIOCGIFINDEX_vxcan", 54}, {"ioctl$int_in", 54}, {"ioctl$int_out", 54}, {"ioctl$sock_FIOGETOWN", 54}, @@ -6379,7 +6378,6 @@ const call_t syscalls[] = { {"ioctl$VT_WAITACTIVE", 16}, {"ioctl$ifreq_SIOCGIFINDEX_team", 16}, {"ioctl$ifreq_SIOCGIFINDEX_vcan", 16}, - {"ioctl$ifreq_SIOCGIFINDEX_vxcan", 16}, {"ioctl$int_in", 16}, {"ioctl$int_out", 16}, {"ioctl$sock_FIOGETOWN", 16}, @@ -9196,7 +9194,6 @@ const call_t syscalls[] = { {"ioctl$VT_WAITACTIVE", 54}, {"ioctl$ifreq_SIOCGIFINDEX_team", 54}, {"ioctl$ifreq_SIOCGIFINDEX_vcan", 54}, - {"ioctl$ifreq_SIOCGIFINDEX_vxcan", 54}, {"ioctl$int_in", 54}, {"ioctl$int_out", 54}, {"ioctl$sock_FIOGETOWN", 54}, @@ -11999,7 +11996,6 @@ const call_t syscalls[] = { {"ioctl$VT_WAITACTIVE", 29}, {"ioctl$ifreq_SIOCGIFINDEX_team", 29}, {"ioctl$ifreq_SIOCGIFINDEX_vcan", 29}, - {"ioctl$ifreq_SIOCGIFINDEX_vxcan", 29}, {"ioctl$int_in", 29}, {"ioctl$int_out", 29}, {"ioctl$sock_FIOGETOWN", 29}, @@ -14775,7 +14771,6 @@ const call_t syscalls[] = { {"ioctl$VT_WAITACTIVE", 54}, {"ioctl$ifreq_SIOCGIFINDEX_team", 54}, {"ioctl$ifreq_SIOCGIFINDEX_vcan", 54}, - {"ioctl$ifreq_SIOCGIFINDEX_vxcan", 54}, {"ioctl$int_in", 54}, {"ioctl$int_out", 54}, {"ioctl$sock_FIOGETOWN", 54}, |