Skip to content

Commit

Permalink
ip_gre: fix potential memory leak in erspan_rcv
Browse files Browse the repository at this point in the history
If md is NULL, tun_dst must be freed, otherwise it will cause memory
leak.

Fixes: 1a66a83 ("gre: add collect_md mode to ERSPAN tunnel")
Cc: William Tu <u9012063@gmail.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Haishuang Yan authored and David S. Miller committed Dec 20, 2017
1 parent a734321 commit 50670b6
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion net/ipv4/ip_gre.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,10 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,
return PACKET_REJECT;

md = ip_tunnel_info_opts(&tun_dst->u.tun_info);
if (!md)
if (!md) {
dst_release((struct dst_entry *)tun_dst);
return PACKET_REJECT;
}

memcpy(md, pkt_md, sizeof(*md));
md->version = ver;
Expand Down

0 comments on commit 50670b6

Please sign in to comment.