* [PATCH v2,net-next 1/2] ip_gre: fix potential memory leak in erspan_rcv
@ 2017-12-16 2:48 Haishuang Yan
2017-12-16 2:48 ` [PATCH v2,net-next 2/2] ip6_gre: fix potential memory leak in ip6erspan_rcv Haishuang Yan
2017-12-19 15:36 ` [PATCH v2,net-next 1/2] ip_gre: fix potential memory leak in erspan_rcv David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Haishuang Yan @ 2017-12-16 2:48 UTC (permalink / raw
To: David S. Miller, Alexey Kuznetsov, Hideaki YOSHIFUJI
Cc: netdev, linux-kernel, Haishuang Yan, William Tu
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(-)
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;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2,net-next 2/2] ip6_gre: fix potential memory leak in ip6erspan_rcv
2017-12-16 2:48 [PATCH v2,net-next 1/2] ip_gre: fix potential memory leak in erspan_rcv Haishuang Yan
@ 2017-12-16 2:48 ` Haishuang Yan
2017-12-19 15:36 ` David Miller
2017-12-19 15:36 ` [PATCH v2,net-next 1/2] ip_gre: fix potential memory leak in erspan_rcv David Miller
1 sibling, 1 reply; 5+ messages in thread
From: Haishuang Yan @ 2017-12-16 2:48 UTC (permalink / raw
To: David S. Miller, Alexey Kuznetsov, Hideaki YOSHIFUJI
Cc: netdev, linux-kernel, Haishuang Yan, William Tu
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(-)
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;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2,net-next 1/2] ip_gre: fix potential memory leak in erspan_rcv
2017-12-16 2:48 [PATCH v2,net-next 1/2] ip_gre: fix potential memory leak in erspan_rcv Haishuang Yan
2017-12-16 2:48 ` [PATCH v2,net-next 2/2] ip6_gre: fix potential memory leak in ip6erspan_rcv Haishuang Yan
@ 2017-12-19 15:36 ` David Miller
2017-12-20 1:33 ` Haishuang Yan
1 sibling, 1 reply; 5+ messages in thread
From: David Miller @ 2017-12-19 15:36 UTC (permalink / raw
To: yanhaishuang; +Cc: kuznet, yoshfuji, netdev, linux-kernel, u9012063
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2,net-next 2/2] ip6_gre: fix potential memory leak in ip6erspan_rcv
2017-12-16 2:48 ` [PATCH v2,net-next 2/2] ip6_gre: fix potential memory leak in ip6erspan_rcv Haishuang Yan
@ 2017-12-19 15:36 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2017-12-19 15:36 UTC (permalink / raw
To: yanhaishuang; +Cc: kuznet, yoshfuji, netdev, linux-kernel, u9012063
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2,net-next 1/2] ip_gre: fix potential memory leak in erspan_rcv
2017-12-19 15:36 ` [PATCH v2,net-next 1/2] ip_gre: fix potential memory leak in erspan_rcv David Miller
@ 2017-12-20 1:33 ` Haishuang Yan
0 siblings, 0 replies; 5+ messages in thread
From: Haishuang Yan @ 2017-12-20 1:33 UTC (permalink / raw
To: David Miller; +Cc: kuznet, yoshfuji, netdev, linux-kernel, u9012063
> 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-12-20 1:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-16 2:48 [PATCH v2,net-next 1/2] ip_gre: fix potential memory leak in erspan_rcv Haishuang Yan
2017-12-16 2:48 ` [PATCH v2,net-next 2/2] ip6_gre: fix potential memory leak in ip6erspan_rcv Haishuang Yan
2017-12-19 15:36 ` David Miller
2017-12-19 15:36 ` [PATCH v2,net-next 1/2] ip_gre: fix potential memory leak in erspan_rcv David Miller
2017-12-20 1:33 ` Haishuang Yan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.