fix possible use-after-free in erspan_v{4,6}
Subsystems (3)
cover fix possible use-after-free in erspan_v{4,6}
Similar to what I did in commit bb9bd814ebf0, fix possible use-after-free in erspan_rcv and ip6erspan_rcv extracting tunnel metadata since the packet can be 'uncloned' running __iptunnel_pull_header
Lorenzo Bianconi (2):
net: ip_gre: fix possible use-after-free in erspan_rcv
net: ip6_gre: fix possible use-after-free in ip6erspan_rcv
net/ipv4/ip_gre.c | 15 ++++++++++----- net/ipv6/ip6_gre.c | 20 +++++++++++++------- 2 files changed, 23 insertions(+), 12 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 net: ip_gre: fix possible use-after-free in erspan_rcv
erspan tunnels run __iptunnel_pull_header on received skbs to remove gre and erspan headers. This can determine a possible use-after-free accessing pkt_md pointer in erspan_rcv since the packet will be 'uncloned' running pskb_expand_head if it is a cloned gso skb (e.g if the packet has been sent though a veth device). Fix it resetting pkt_md pointer after __iptunnel_pull_header
--- net/ipv4/ip_gre.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
net/ipv4/ip_gre.c +10 -5
@@ -259,7 +259,6 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,struct net *net =dev_net (skb->dev);struct metadata_dst *tun_dst =NULL ;struct erspan_base_hdr *ershdr; -struct erspan_metadata *pkt_md;struct ip_tunnel_net *itn;struct ip_tunnel *tunnel;const struct iphdr *iph;
@@ -282,9 +281,6 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,if (unlikely (!pskb_may_pull (skb, len)))return PACKET_REJECT ; - ershdr = (struct erspan_base_hdr *)(skb->data + gre_hdr_len); - pkt_md = (struct erspan_metadata *)(ershdr +1 ); - if (__iptunnel_pull_header(skb, len, htons(ETH_P_TEB),
@@ -292,8 +288,9 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi, goto drop;if (tunnel->collect_md) { +struct erspan_metadata *pkt_md, *md;struct ip_tunnel_info *info; -struct erspan_metadata *md; +unsigned char *gh;__be64 tun_id;__be16 flags;
@@ -306,6 +303,14 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,if (!tun_dst)return PACKET_REJECT ; +/* skb can be uncloned in __iptunnel_pull_header, so +* old pkt_md is no longer valid and we need to reset +* it +*/ + gh =skb_network_header (skb) + +skb_network_header_len (skb); + pkt_md = (struct erspan_metadata *)(gh + gre_hdr_len + +sizeof (*ershdr)); md =ip_tunnel_info_opts (&tun_dst->u.tun_info); md->version = ver; md2 = &md->u.md2;
Signature · 1 line
2.20.1
PATCH 2/2 net: ip6_gre: fix possible use-after-free in ip6erspan_rcv
In reply to Lorenzo Bianconierspan_v6 tunnels run __iptunnel_pull_header on received skbs to remove erspan header. This can determine a possible use-after-free accessing pkt_md pointer in ip6erspan_rcv since the packet will be 'uncloned' running pskb_expand_head if it is a cloned gso skb (e.g if the packet has been sent though a veth device). Fix it resetting pkt_md pointer after __iptunnel_pull_header
--- net/ipv6/ip6_gre.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
net/ipv6/ip6_gre.c +13 -7
@@ -525,10 +525,10 @@ static int ip6gre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi) }static int ip6erspan_rcv (struct sk_buff *skb, -struct tnl_ptk_info *tpi) +struct tnl_ptk_info *tpi, +int gre_hdr_len) {struct erspan_base_hdr *ershdr; -struct erspan_metadata *pkt_md;const struct ipv6hdr *ipv6h;struct erspan_md2 *md2;struct ip6_tnl *tunnel;
@@ -547,18 +547,16 @@ static int ip6erspan_rcv(struct sk_buff *skb,if (unlikely (!pskb_may_pull (skb, len)))return PACKET_REJECT ; - ershdr = (struct erspan_base_hdr *)skb->data; - pkt_md = (struct erspan_metadata *)(ershdr +1 ); -if (__iptunnel_pull_header (skb, len,htons (ETH_P_TEB ), false, false) <0 )return PACKET_REJECT ;if (tunnel->parms.collect_md) { +struct erspan_metadata *pkt_md, *md;struct metadata_dst *tun_dst;struct ip_tunnel_info *info; -struct erspan_metadata *md; +unsigned char *gh;__be64 tun_id;__be16 flags;
@@ -571,6 +569,14 @@ static int ip6erspan_rcv(struct sk_buff *skb,if (!tun_dst)return PACKET_REJECT ; +/* skb can be uncloned in __iptunnel_pull_header, so +* old pkt_md is no longer valid and we need to reset +* it +*/ + gh =skb_network_header (skb) + +skb_network_header_len (skb); + pkt_md = (struct erspan_metadata *)(gh + gre_hdr_len + +sizeof (*ershdr)); info = &tun_dst->u.tun_info; md =ip_tunnel_info_opts (info); md->version = ver;
@@ -607,7 +613,7 @@ static int gre_rcv(struct sk_buff *skb)if (unlikely (tpi.proto ==htons (ETH_P_ERSPAN ) || tpi.proto ==htons (ETH_P_ERSPAN2 ))) { -if (ip6erspan_rcv (skb, &tpi) ==PACKET_RCVD ) +if (ip6erspan_rcv (skb, &tpi, hdr_len) ==PACKET_RCVD )return 0 ; goto out; }
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Lorenzo Bianconi <[email protected]>
Date: Sat, 6 Apr 2019 17:16:51 +0200
Quoted 3 lines
Similar to what I did in commit
bb9bd814ebf0, fix possible use-after-free inerspan_rcvandip6erspan_rcvextracting tunnel metadata since the packet can be 'uncloned' running__iptunnel_pull_header
Series applied and queued up for -stable.