leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

erspan: fix the tun_info options_len check for erspan

Browse Source 
The check for !md doens't really work for ip_tunnel_info_opts(info) which
only does info + 1. Also to avoid out-of-bounds access on info, it should
ensure options_len is not less than erspan_metadata in both erspan_xmit()
and ip6erspan_tunnel_xmit().

Fixes: 1a66a836da ("gre: add collect_md mode to ERSPAN tunnel")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Xin Long 2019-10-28 23:19:35 +08:00 committed by David S. Miller
parent e56bd641ca
commit 2eb8d6d291
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/ip_gre.c
View File

@ -509,9 +509,9 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev)
key = &tun_info->key; key = &tun_info->key;
if (!(tun_info->key.tun_flags & TUNNEL_ERSPAN_OPT)) if (!(tun_info->key.tun_flags & TUNNEL_ERSPAN_OPT))
goto err_free_skb; goto err_free_skb;
md = ip_tunnel_info_opts(tun_info); if (tun_info->options_len < sizeof(*md))
if (!md)
goto err_free_skb; goto err_free_skb;
md = ip_tunnel_info_opts(tun_info);
/* ERSPAN has fixed 8 byte GRE header */ /* ERSPAN has fixed 8 byte GRE header */
version = md->version; version = md->version;

4
net/ipv6/ip6_gre.c
View File

@ -980,9 +980,9 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,
dsfield = key->tos; dsfield = key->tos;
if (!(tun_info->key.tun_flags & TUNNEL_ERSPAN_OPT)) if (!(tun_info->key.tun_flags & TUNNEL_ERSPAN_OPT))
goto tx_err; goto tx_err;
md = ip_tunnel_info_opts(tun_info); if (tun_info->options_len < sizeof(*md))
if (!md)
goto tx_err; goto tx_err;
md = ip_tunnel_info_opts(tun_info);
tun_id = tunnel_id_to_key32(key->tun_id); tun_id = tunnel_id_to_key32(key->tun_id);
if (md->version == 1) { if (md->version == 1) {