aboutsummaryrefslogtreecommitdiffstats
path: root/executor
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2019-12-30 20:18:14 +0100
committerDmitry Vyukov <dvyukov@google.com>2019-12-30 20:18:14 +0100
commit7f117e28b86fbcd044980c4d2c8baa07548bf0cb (patch)
treec3430c7a2b21ed2e2c2fd9f78c99658b24dcf947 /executor
parent74da6acb2157908c0ac6524cbf3bfb60a1221531 (diff)
sys/linux: add virt_wifi and xfrm devices
+ some netlink descriptions
Diffstat (limited to 'executor')
-rw-r--r--executor/common_linux.h16
-rw-r--r--executor/defs.h12
-rw-r--r--executor/syscalls.h24
3 files changed, 46 insertions, 6 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h
index 23f830a8f..aa9eca32a 100644
--- a/executor/common_linux.h
+++ b/executor/common_linux.h
@@ -272,6 +272,18 @@ static void netlink_add_hsr(struct nlmsg* nlmsg, int sock, const char* name,
name, slave1, slave2, strerror(err));
(void)err;
}
+
+static void netlink_add_virt_wifi(struct nlmsg* nlmsg, int sock, const char* name, const char* link)
+{
+ netlink_add_device_impl(nlmsg, "virt_wifi", name);
+ netlink_done(nlmsg);
+ int ifindex = if_nametoindex(link);
+ netlink_attr(nlmsg, IFLA_LINK, &ifindex, sizeof(ifindex));
+ int err = netlink_send(nlmsg, sock);
+ debug("netlink: adding device %s type virt_wifi link %s: %s\n",
+ name, link, strerror(err));
+ (void)err;
+}
#endif
#if SYZ_EXECUTOR || SYZ_NET_DEVICES || SYZ_NET_INJECTION || SYZ_DEVLINK_PCI
@@ -714,6 +726,7 @@ static void initialize_netdevices(void)
{"netdevsim", netdevsim},
// This adds connected veth0 and veth1 devices.
{"veth", 0},
+ {"xfrm", "xfrm0"},
};
const char* devmasters[] = {"bridge", "bond", "team"};
// If you extend this array, also update netdev_addr_id in vnet.txt.
@@ -755,6 +768,8 @@ static void initialize_netdevices(void)
{"caif0", ETH_ALEN}, // TODO: up'ing caif fails with ENODEV
{"batadv0", ETH_ALEN},
{netdevsim, ETH_ALEN},
+ {"xfrm0", ETH_ALEN},
+ {"virt_wifi0", ETH_ALEN},
};
int sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
if (sock == -1)
@@ -789,6 +804,7 @@ 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");
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 9bdb93846..000b052ee 100644
--- a/executor/defs.h
+++ b/executor/defs.h
@@ -70,7 +70,7 @@
#if GOARCH_386
#define GOARCH "386"
-#define SYZ_REVISION "a1c81dce4b42a545e15fcb8a931b0d9b3505c3f2"
+#define SYZ_REVISION "157b55fd1f528118ea52fa1e0c21bb374993121c"
#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 "f937c6f69138fb188e0ca117eb97010d403d947b"
+#define SYZ_REVISION "e6f3f9ae5524f0e08a87d36f9220d85e1411dfcc"
#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 "7401acc44c98ef35927f489adedba830e0fc91f3"
+#define SYZ_REVISION "33c6dcbbbfea4e6a2698085406ab521df5dc86e4"
#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 "b37a6b91b151c4bf29c836c503da436754a76ee4"
+#define SYZ_REVISION "c1de276242e00394a87bf45247d2e4035c5a0d39"
#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 "5e16bc782ff9de6177ea8883c6e7d59a054c8f0a"
+#define SYZ_REVISION "d58823a066e2f2b96dda28b33593619a4c0cf212"
#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 "b7381c109e9546b5c27058269406fd95955fb499"
+#define SYZ_REVISION "a7a6501f5b955c40349ecbfc7e513ef6cd01743a"
#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 c39810fd1..83ff29c86 100644
--- a/executor/syscalls.h
+++ b/executor/syscalls.h
@@ -4235,6 +4235,9 @@ const call_t syscalls[] = {
{"sendmsg$FOU_CMD_ADD", 370},
{"sendmsg$FOU_CMD_DEL", 370},
{"sendmsg$FOU_CMD_GET", 370},
+ {"sendmsg$GTP_CMD_DELPDP", 370},
+ {"sendmsg$GTP_CMD_GETPDP", 370},
+ {"sendmsg$GTP_CMD_NEWPDP", 370},
{"sendmsg$IPVS_CMD_DEL_DAEMON", 370},
{"sendmsg$IPVS_CMD_DEL_DEST", 370},
{"sendmsg$IPVS_CMD_DEL_SERVICE", 370},
@@ -4749,6 +4752,7 @@ const call_t syscalls[] = {
{"syz_genetlink_get_family_id$SEG6", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$devlink", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$fou", 0, (syscall_t)syz_genetlink_get_family_id},
+ {"syz_genetlink_get_family_id$gtp", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$ipvs", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$nbd", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$net_dm", 0, (syscall_t)syz_genetlink_get_family_id},
@@ -7290,6 +7294,9 @@ const call_t syscalls[] = {
{"sendmsg$FOU_CMD_ADD", 46},
{"sendmsg$FOU_CMD_DEL", 46},
{"sendmsg$FOU_CMD_GET", 46},
+ {"sendmsg$GTP_CMD_DELPDP", 46},
+ {"sendmsg$GTP_CMD_GETPDP", 46},
+ {"sendmsg$GTP_CMD_NEWPDP", 46},
{"sendmsg$IPVS_CMD_DEL_DAEMON", 46},
{"sendmsg$IPVS_CMD_DEL_DEST", 46},
{"sendmsg$IPVS_CMD_DEL_SERVICE", 46},
@@ -7803,6 +7810,7 @@ const call_t syscalls[] = {
{"syz_genetlink_get_family_id$SEG6", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$devlink", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$fou", 0, (syscall_t)syz_genetlink_get_family_id},
+ {"syz_genetlink_get_family_id$gtp", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$ipvs", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$nbd", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$net_dm", 0, (syscall_t)syz_genetlink_get_family_id},
@@ -10300,6 +10308,9 @@ const call_t syscalls[] = {
{"sendmsg$FOU_CMD_ADD", 296},
{"sendmsg$FOU_CMD_DEL", 296},
{"sendmsg$FOU_CMD_GET", 296},
+ {"sendmsg$GTP_CMD_DELPDP", 296},
+ {"sendmsg$GTP_CMD_GETPDP", 296},
+ {"sendmsg$GTP_CMD_NEWPDP", 296},
{"sendmsg$IPVS_CMD_DEL_DAEMON", 296},
{"sendmsg$IPVS_CMD_DEL_DEST", 296},
{"sendmsg$IPVS_CMD_DEL_SERVICE", 296},
@@ -10812,6 +10823,7 @@ const call_t syscalls[] = {
{"syz_genetlink_get_family_id$SEG6", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$devlink", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$fou", 0, (syscall_t)syz_genetlink_get_family_id},
+ {"syz_genetlink_get_family_id$gtp", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$ipvs", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$nbd", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$net_dm", 0, (syscall_t)syz_genetlink_get_family_id},
@@ -13286,6 +13298,9 @@ const call_t syscalls[] = {
{"sendmsg$FOU_CMD_ADD", 211},
{"sendmsg$FOU_CMD_DEL", 211},
{"sendmsg$FOU_CMD_GET", 211},
+ {"sendmsg$GTP_CMD_DELPDP", 211},
+ {"sendmsg$GTP_CMD_GETPDP", 211},
+ {"sendmsg$GTP_CMD_NEWPDP", 211},
{"sendmsg$IPVS_CMD_DEL_DAEMON", 211},
{"sendmsg$IPVS_CMD_DEL_DEST", 211},
{"sendmsg$IPVS_CMD_DEL_SERVICE", 211},
@@ -13792,6 +13807,7 @@ const call_t syscalls[] = {
{"syz_genetlink_get_family_id$SEG6", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$devlink", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$fou", 0, (syscall_t)syz_genetlink_get_family_id},
+ {"syz_genetlink_get_family_id$gtp", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$ipvs", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$nbd", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$net_dm", 0, (syscall_t)syz_genetlink_get_family_id},
@@ -16175,6 +16191,9 @@ const call_t syscalls[] = {
{"sendmsg$FOU_CMD_ADD", 5045},
{"sendmsg$FOU_CMD_DEL", 5045},
{"sendmsg$FOU_CMD_GET", 5045},
+ {"sendmsg$GTP_CMD_DELPDP", 5045},
+ {"sendmsg$GTP_CMD_GETPDP", 5045},
+ {"sendmsg$GTP_CMD_NEWPDP", 5045},
{"sendmsg$IPVS_CMD_DEL_DAEMON", 5045},
{"sendmsg$IPVS_CMD_DEL_DEST", 5045},
{"sendmsg$IPVS_CMD_DEL_SERVICE", 5045},
@@ -16688,6 +16707,7 @@ const call_t syscalls[] = {
{"syz_genetlink_get_family_id$SEG6", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$devlink", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$fou", 0, (syscall_t)syz_genetlink_get_family_id},
+ {"syz_genetlink_get_family_id$gtp", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$ipvs", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$nbd", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$net_dm", 0, (syscall_t)syz_genetlink_get_family_id},
@@ -19179,6 +19199,9 @@ const call_t syscalls[] = {
{"sendmsg$FOU_CMD_ADD", 341},
{"sendmsg$FOU_CMD_DEL", 341},
{"sendmsg$FOU_CMD_GET", 341},
+ {"sendmsg$GTP_CMD_DELPDP", 341},
+ {"sendmsg$GTP_CMD_GETPDP", 341},
+ {"sendmsg$GTP_CMD_NEWPDP", 341},
{"sendmsg$IPVS_CMD_DEL_DAEMON", 341},
{"sendmsg$IPVS_CMD_DEL_DEST", 341},
{"sendmsg$IPVS_CMD_DEL_SERVICE", 341},
@@ -19690,6 +19713,7 @@ const call_t syscalls[] = {
{"syz_genetlink_get_family_id$SEG6", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$devlink", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$fou", 0, (syscall_t)syz_genetlink_get_family_id},
+ {"syz_genetlink_get_family_id$gtp", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$ipvs", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$nbd", 0, (syscall_t)syz_genetlink_get_family_id},
{"syz_genetlink_get_family_id$net_dm", 0, (syscall_t)syz_genetlink_get_family_id},