diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-01-03 09:58:48 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-01-03 16:11:49 +0100 |
| commit | fca6a74d0c61dd34f252deb900c52027d9fc373f (patch) | |
| tree | 5946a904ef6405648f0c4d4b83f3b8f7ce3dd8db /executor | |
| parent | 5e3bc74104143da1d2584bf2bf312ae277caf756 (diff) | |
executor: connect virt_wifi to veth
virt_wifi docs say that the enslaved device won't be usable
on itself. It's probably not a good idea to make lo unusable.
Enslave a dedicated veth instead.
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/common_linux.h | 6 | ||||
| -rw-r--r-- | executor/defs.h | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index aa9eca32a..21560886b 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -769,6 +769,8 @@ static void initialize_netdevices(void) {"batadv0", ETH_ALEN}, {netdevsim, ETH_ALEN}, {"xfrm0", ETH_ALEN}, + {"veth0_virt_wifi", ETH_ALEN}, + {"veth1_virt_wifi", ETH_ALEN}, {"virt_wifi0", ETH_ALEN}, }; int sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); @@ -804,7 +806,9 @@ static void initialize_netdevices(void) netlink_add_hsr(&nlmsg, sock, "hsr0", "hsr_slave_0", "hsr_slave_1"); netlink_device_change(&nlmsg, sock, "hsr_slave_0", true, 0, 0, 0, NULL); netlink_device_change(&nlmsg, sock, "hsr_slave_1", true, 0, 0, 0, NULL); - netlink_add_virt_wifi(&nlmsg, sock, "virt_wifi0", "lo"); + + netlink_add_veth(&nlmsg, sock, "veth0_virt_wifi", "veth1_virt_wifi"); + netlink_add_virt_wifi(&nlmsg, sock, "virt_wifi0", "veth1_virt_wifi"); netdevsim_add((int)procid, 4); // Number of port is in sync with value in sys/linux/socket_netlink_generic_devlink.txt diff --git a/executor/defs.h b/executor/defs.h index fa402a88b..3a5ab0e9c 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "7a677a67aa0fc117d1f9abe2ff37e7f54e3281fa" +#define SYZ_REVISION "fc8551aa0fd6abc38eba8bff7ad4703ea5276d5f" #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 "10db21b7d8208facd04670775a3dbd60e1556d85" +#define SYZ_REVISION "5433486f12d6cc7254bd0ac72842e94ffc061e3e" #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 "70741613bdd81f3e4d8893cc5d9091550412e769" +#define SYZ_REVISION "e881d871ba924215b7ffc90dbeb26774a6e75e97" #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 "b346578b5c62dbf7d05004406b898edfb6c49816" +#define SYZ_REVISION "33b7dfcc5cc20c2e4822297114ab46480909125c" #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 "9ec454242677d05977953f4b5d1d88f858cd3a75" +#define SYZ_REVISION "478703fad5b3bc5c902ee6276c2629beb066aa39" #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 "482a1a6823af8deef65d2e1727f013e514bd9163" +#define SYZ_REVISION "22fcd68970b3b2d79e435303d3db764f024e7436" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 |