diff options
| author | Jiri Benc <jbenc@redhat.com> | 2016-04-27 14:08:01 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-28 23:09:37 +0200 |
| commit | 946b636f1730c64e05ff7fe8cf7136422fa8ea70 (patch) | |
| tree | b5bc9f08c93362d866703b251b811143d88f1957 /net/ipv4/ip_gre.c | |
| parent | Merge branch 'pegasus-sizes' (diff) | |
| download | linux-946b636f1730c64e05ff7fe8cf7136422fa8ea70.tar.xz linux-946b636f1730c64e05ff7fe8cf7136422fa8ea70.zip | |
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: 2e15ea390e6f4 ("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>
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index f973e0a58993..f502d34bcb40 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -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; } |