summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorHaishuang Yan <yanhaishuang@cmss.chinamobile.com>2017-12-20 10:07:00 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-24 11:02:50 +0100
commit70559f800f6267303d896f33b18607b6b1896d86 (patch)
treedc36f46f8cbd030edb71c588f9f6a6e073993918 /net
parent09d5f2bb8fc731ef6d463928c3413fe569729990 (diff)
downloadlinux-70559f800f6267303d896f33b18607b6b1896d86.tar.gz
linux-70559f800f6267303d896f33b18607b6b1896d86.tar.bz2
linux-70559f800f6267303d896f33b18607b6b1896d86.zip
ip_gre: fix potential memory leak in erspan_rcv
[ Upstream commit 50670b6ee9bc4ae8f9ce3112b437987adf273245 ] If md is NULL, tun_dst must be freed, otherwise it will cause memory leak. Fixes: 1a66a836da6 ("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> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_gre.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index e05bca0e61fc..01bbbfe2c2a7 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -303,8 +303,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;
+ }
md->index = index;
info = &tun_dst->u.tun_info;