diff options
author | Thomas Graf <tgraf@suug.ch> | 2014-12-16 15:05:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-16 15:20:41 -0500 |
commit | f1fb521f7d94c35e278d76a9198f078223f26799 (patch) | |
tree | 8c2c239aa92c0a1cbe8256ec70635c265f3a3285 | |
parent | bb1553c800227f33063fe96561af881619447b83 (diff) |
ip_tunnel: Add missing validation of encap type to ip_tunnel_encap_setup()
The encap->type comes straight from Netlink. Validate it against
max supported encap types just like ip_encap_hlen() already does.
Fixes: a8c5f9 ("ip_tunnel: Ops registration for secondary encap (fou, gue)")
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/ip_tunnel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 2f498f87e3d8..d3e447936720 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c | |||
@@ -573,6 +573,9 @@ int ip_tunnel_encap(struct sk_buff *skb, struct ip_tunnel *t, | |||
573 | if (t->encap.type == TUNNEL_ENCAP_NONE) | 573 | if (t->encap.type == TUNNEL_ENCAP_NONE) |
574 | return 0; | 574 | return 0; |
575 | 575 | ||
576 | if (t->encap.type >= MAX_IPTUN_ENCAP_OPS) | ||
577 | return -EINVAL; | ||
578 | |||
576 | rcu_read_lock(); | 579 | rcu_read_lock(); |
577 | ops = rcu_dereference(iptun_encaps[t->encap.type]); | 580 | ops = rcu_dereference(iptun_encaps[t->encap.type]); |
578 | if (likely(ops && ops->build_header)) | 581 | if (likely(ops && ops->build_header)) |