Commit 946b636f authored Apr 27, 2016 by Jiri Benc Committed by David S. Miller Apr 28, 2016

gre: reject GUE and FOU in collect metadata mode



The collect metadata mode does not support GUE nor FOU. This might be
implemented later; until then, we should reject such config.

I think this is okay to be changed. It's unlikely anyone has such
configuration (as it doesn't work anyway) and we may need a way to
distinguish whether it's supported or not by the kernel later.

For backwards compatibility with iproute2, it's not possible to just check
the attribute presence (iproute2 always includes the attribute), the actual
value has to be checked, too.

Fixes: 2e15ea39 ("ip_gre: Add support to collect tunnel metadata.")
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 47ff5805

net/ipv4/ip_gre.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -948,6 +948,11 @@ static int ipgre_tunnel_validate(struct nlattr tb[], struct nlattr data[])
		if (flags & (GRE_VERSION\|GRE_ROUTING))
		return -EINVAL;

		if (data[IFLA_GRE_COLLECT_METADATA] &&
		data[IFLA_GRE_ENCAP_TYPE] &&
		nla_get_u16(data[IFLA_GRE_ENCAP_TYPE]) != TUNNEL_ENCAP_NONE)
		return -EINVAL;

		return 0;
		}

Admin message