ip_gre: fix potential memory leak in erspan_rcv
authorHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Wed, 20 Dec 2017 02:07:00 +0000 (10:07 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 24 Mar 2018 10:01:27 +0000 (11:01 +0100)
[ 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>
net/ipv4/ip_gre.c

index c872be8f4065284067092feb00b8dcaac7c8b5b2..23e6d5532b5c5f05e73ec2c12968d5a38fc92ceb 100644 (file)
@@ -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;