diff options
| author | Jiri Benc <jbenc@redhat.com> | 2015-08-28 20:48:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-29 22:07:54 +0200 |
| commit | 7f9562a1f405306eacb97f95d78cb996e33f27f5 (patch) | |
| tree | 298378f868e85024a908e9bae1e0754fc59e169e /net/core | |
| parent | ip_tunnels: convert the mode field of ip_tunnel_info to flags (diff) | |
| download | linux-7f9562a1f405306eacb97f95d78cb996e33f27f5.tar.xz linux-7f9562a1f405306eacb97f95d78cb996e33f27f5.zip | |
ip_tunnels: record IP version in tunnel info
There's currently nothing preventing directing packets with IPv6
encapsulation data to IPv4 tunnels (and vice versa). If this happens,
IPv6 addresses are incorrectly interpreted as IPv4 ones.
Track whether the given ip_tunnel_key contains IPv4 or IPv6 data. Store this
in ip_tunnel_info. Reject packets at appropriate places if they are supposed
to be encapsulated into an incompatible protocol.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/filter.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index 66500d490995..13079f03902e 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -1493,6 +1493,8 @@ static u64 bpf_skb_get_tunnel_key(u64 r1, u64 r2, u64 size, u64 flags, u64 r5) if (unlikely(size != sizeof(struct bpf_tunnel_key) || flags || !info)) return -EINVAL; + if (ip_tunnel_info_af(info) != AF_INET) + return -EINVAL; to->tunnel_id = be64_to_cpu(info->key.tun_id); to->remote_ipv4 = be32_to_cpu(info->key.u.ipv4.src); |