| Message ID | 1513392519-30127-2-git-send-email-yanhaishuang@cmss.chinamobile.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2,net-next,1/2] ip_gre: fix potential memory leak in erspan_rcv | expand |
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Date: Sat, 16 Dec 2017 10:48:39 +0800 > If md is NULL, tun_dst must be freed, otherwise it will cause memory > leak. > > Fixes: ef7baf5e083c ("ip6_gre: add ip6 erspan collect_md mode") > Cc: William Tu <u9012063@gmail.com> > Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> > > Change since v2: > * Rebase on latest master branch. > * Correct wrong fix information. Likewise, please place the tags at the end of the commit message.
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 5c9c65f..8ce9d42 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -549,8 +549,10 @@ static int ip6erspan_rcv(struct sk_buff *skb, int gre_hdr_len, info = &tun_dst->u.tun_info; md = ip_tunnel_info_opts(info); - if (!md) + if (!md) { + dst_release((struct dst_entry *)tun_dst); return PACKET_REJECT; + } memcpy(md, pkt_md, sizeof(*md)); md->version = ver;
If md is NULL, tun_dst must be freed, otherwise it will cause memory leak. Fixes: ef7baf5e083c ("ip6_gre: add ip6 erspan collect_md mode") Cc: William Tu <u9012063@gmail.com> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Change since v2: * Rebase on latest master branch. * Correct wrong fix information. --- net/ipv6/ip6_gre.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)