| Message ID | 1513392519-30127-1-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:38 +0800 > 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> > > Change since v2: > * Rebase on latest master branch. > * Correct wrong fix information. Please do not put a changelog after the fixes and signoff tags, those tags must appear last in the commit message. Thank you.
> On 2017年12月19日, at 下午11:36, David Miller <davem@davemloft.net> wrote: > > From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> > Date: Sat, 16 Dec 2017 10:48:38 +0800 > >> 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> >> >> Change since v2: >> * Rebase on latest master branch. >> * Correct wrong fix information. > > Please do not put a changelog after the fixes and signoff tags, those tags must > appear last in the commit message. > > Thank you. > Okay, I will resubmit another commit, thanks.
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 004800b..33af55a 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -311,8 +311,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;
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> Change since v2: * Rebase on latest master branch. * Correct wrong fix information. --- net/ipv4/ip_gre.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)