Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd7eafd0 authored by Hangbin Liu's avatar Hangbin Liu Committed by David S. Miller
Browse files

geneve: fix fill_info when link down 



geneve->sock4/6 were added with geneve_open and released with geneve_stop.
So when geneve link down, we will not able to show remote address and
checksum info after commit 11387fe4 ("geneve: fix fill_info when using
collect_metadata").

Fix this by avoid passing *_REMOTE{,6} for COLLECT_METADATA since they are
mutually exclusive, and always show UDP_ZERO_CSUM6_RX info.

Fixes: 11387fe4 ("geneve: fix fill_info when using collect_metadata")
Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89ad2fa3

drivers/net/geneve.c

+10 −14
Original line number Diff line number Diff line
@@ -1490,6 +1490,7 @@ static int geneve_fill_info(struct sk_buff *skb, const struct net_device *dev) 
{

	struct geneve_dev *geneve = netdev_priv(dev);

	struct ip_tunnel_info *info = &geneve->info;

	bool metadata = geneve->collect_md;

	__u8 tmp_vni[3];

	__u32 vni;
@@ -1498,32 +1499,24 @@ static int geneve_fill_info(struct sk_buff *skb, const struct net_device *dev) 
	if (nla_put_u32(skb, IFLA_GENEVE_ID, vni))

		goto nla_put_failure;



	if (rtnl_dereference(geneve->sock4)) {

	if (!metadata && ip_tunnel_info_af(info) == AF_INET) {

		if (nla_put_in_addr(skb, IFLA_GENEVE_REMOTE,

				    info->key.u.ipv4.dst))

			goto nla_put_failure;



		if (nla_put_u8(skb, IFLA_GENEVE_UDP_CSUM,

			       !!(info->key.tun_flags & TUNNEL_CSUM)))

			goto nla_put_failure;



	}



#if IS_ENABLED(CONFIG_IPV6)

	if (rtnl_dereference(geneve->sock6)) {

	} else if (!metadata) {

		if (nla_put_in6_addr(skb, IFLA_GENEVE_REMOTE6,

				     &info->key.u.ipv6.dst))

			goto nla_put_failure;



		if (nla_put_u8(skb, IFLA_GENEVE_UDP_ZERO_CSUM6_TX,

			       !(info->key.tun_flags & TUNNEL_CSUM)))

			goto nla_put_failure;



		if (nla_put_u8(skb, IFLA_GENEVE_UDP_ZERO_CSUM6_RX,

			       !geneve->use_udp6_rx_checksums))

			goto nla_put_failure;

	}

#endif

	}



	if (nla_put_u8(skb, IFLA_GENEVE_TTL, info->key.ttl) ||

	    nla_put_u8(skb, IFLA_GENEVE_TOS, info->key.tos) ||
@@ -1533,10 +1526,13 @@ static int geneve_fill_info(struct sk_buff *skb, const struct net_device *dev) 
	if (nla_put_be16(skb, IFLA_GENEVE_PORT, info->key.tp_dst))

		goto nla_put_failure;



	if (geneve->collect_md) {

		if (nla_put_flag(skb, IFLA_GENEVE_COLLECT_METADATA))

	if (metadata && nla_put_flag(skb, IFLA_GENEVE_COLLECT_METADATA))

			goto nla_put_failure;

	}



	if (nla_put_u8(skb, IFLA_GENEVE_UDP_ZERO_CSUM6_RX,

		       !geneve->use_udp6_rx_checksums))

		goto nla_put_failure;



	return 0;



nla_put_failure: