From 30dce346d85935e0904a211bc0209df99af97557 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 10 Nov 2018 15:35:56 +0900 Subject: [PATCH 1/2] network: add missing verification for ip6gretap and sit Fixes oss-fuzz#11324. --- src/network/netdev/tunnel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index 826c7088fe..861c30404c 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -415,17 +415,17 @@ static int netdev_tunnel_verify(NetDev *netdev, const char *filename) { return -EINVAL; } - if (IN_SET(netdev->kind, NETDEV_KIND_VTI, NETDEV_KIND_IPIP, NETDEV_KIND_GRE, NETDEV_KIND_GRETAP) && + if (IN_SET(netdev->kind, NETDEV_KIND_VTI, NETDEV_KIND_IPIP, NETDEV_KIND_SIT, NETDEV_KIND_GRE, NETDEV_KIND_GRETAP) && (t->family != AF_INET || in_addr_is_null(t->family, &t->local))) { log_netdev_error(netdev, - "vti/ipip/gre/gretap tunnel without a local IPv4 address configured in %s. Ignoring", filename); + "vti/ipip/sit/gre/gretap tunnel without a local IPv4 address configured in %s. Ignoring", filename); return -EINVAL; } - if (IN_SET(netdev->kind, NETDEV_KIND_VTI6, NETDEV_KIND_IP6TNL, NETDEV_KIND_IP6GRE) && + if (IN_SET(netdev->kind, NETDEV_KIND_VTI6, NETDEV_KIND_IP6TNL, NETDEV_KIND_IP6GRE, NETDEV_KIND_IP6GRETAP) && (t->family != AF_INET6 || in_addr_is_null(t->family, &t->local))) { log_netdev_error(netdev, - "vti6/ip6tnl/ip6gre tunnel without a local IPv6 address configured in %s. Ignoring", filename); + "vti6/ip6tnl/ip6gre/ip6gretap tunnel without a local IPv6 address configured in %s. Ignoring", filename); return -EINVAL; } From 3ee094290800aa10331d541ba290e6b920d72284 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 10 Nov 2018 15:38:35 +0900 Subject: [PATCH 2/2] fuzz: add testcase for oss-fuzz#11324 --- test/fuzz/fuzz-netdev-parser/oss-fuzz-11324 | Bin 0 -> 79 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/fuzz/fuzz-netdev-parser/oss-fuzz-11324 diff --git a/test/fuzz/fuzz-netdev-parser/oss-fuzz-11324 b/test/fuzz/fuzz-netdev-parser/oss-fuzz-11324 new file mode 100644 index 0000000000000000000000000000000000000000..dea1dcf6e403a79b24a6befe357ef2f01fdda279 GIT binary patch literal 79 zcma#{OD%CpEsN#yOUzBRE#mUd%uBJ&EHFziN-aq&;EE0@&C5&8iRJRlOGzzA1rm8B awj~VFFkQZm&W