From b7c2bb4c9e5ecaa8c27833f00df41be5ae4770c3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 3 Feb 2019 02:50:37 +0100 Subject: [PATCH] network: refuse AF_UNSPEC for Tunnel devices --- src/network/netdev/tunnel.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index 0ea1679..9ee6853 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -48,7 +48,7 @@ static int netdev_ipip_sit_fill_message_create(NetDev *netdev, Link *link, sd_ne assert(m); assert(t); - assert(IN_SET(t->family, AF_INET, AF_UNSPEC)); + assert(t->family == AF_INET); if (link) { r = sd_netlink_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex); @@ -126,7 +126,7 @@ static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_netlink t = GRETAP(netdev); assert(t); - assert(IN_SET(t->family, AF_INET, AF_UNSPEC)); + assert(t->family == AF_INET); assert(m); if (link) { @@ -171,7 +171,7 @@ static int netdev_erspan_fill_message_create(NetDev *netdev, Link *link, sd_netl t = ERSPAN(netdev); assert(t); - assert(IN_SET(t->family, AF_INET, AF_UNSPEC)); + assert(t->family == AF_INET); assert(m); r = sd_netlink_message_append_u32(m, IFLA_GRE_ERSPAN_INDEX, t->erspan_index); @@ -437,10 +437,6 @@ static int netdev_tunnel_verify(NetDev *netdev, const char *filename) { assert(t); - if (!IN_SET(t->family, AF_INET, AF_INET6, AF_UNSPEC)) - return log_netdev_error_errno(netdev, SYNTHETIC_ERRNO(EINVAL), - "Tunnel with invalid address family configured in %s. Ignoring", filename); - if (IN_SET(netdev->kind, NETDEV_KIND_VTI, NETDEV_KIND_IPIP, NETDEV_KIND_SIT, NETDEV_KIND_GRE, NETDEV_KIND_GRETAP, NETDEV_KIND_ERSPAN) && (t->family != AF_INET || in_addr_is_null(t->family, &t->local))) return log_netdev_error_errno(netdev, SYNTHETIC_ERRNO(EINVAL), -- 2.7.4