* [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv
@ 2017-06-15 2:29 Haishuang Yan
2017-06-15 2:29 ` [PATCH v4 2/2] ip6_tunnel: fix potential issue in __ip6_tnl_rcv Haishuang Yan
2017-06-16 16:02 ` [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Haishuang Yan @ 2017-06-15 2:29 UTC (permalink / raw)
To: David S. Miller, Eric Dumazet, Pravin B Shelar, Alexei Starovoitov
Cc: netdev, linux-kernel, Haishuang Yan
When ip_tunnel_rcv fails, the tun_dst won't be freed, so call
dst_release to free it in error code path.
Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Tested-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
Change since v4:
* Add the the missing Fixes information
* Free tun_dst from error code path
* Add tester information
---
net/ipv4/ip_tunnel.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index b878ecb..0f1d876 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -446,6 +446,8 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb,
return 0;
drop:
+ if (tun_dst)
+ dst_release((struct dst_entry *)tun_dst);
kfree_skb(skb);
return 0;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v4 2/2] ip6_tunnel: fix potential issue in __ip6_tnl_rcv
2017-06-15 2:29 [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv Haishuang Yan
@ 2017-06-15 2:29 ` Haishuang Yan
2017-06-16 16:02 ` David Miller
2017-06-16 16:02 ` [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Haishuang Yan @ 2017-06-15 2:29 UTC (permalink / raw)
To: David S. Miller, Eric Dumazet, Pravin B Shelar, Alexei Starovoitov
Cc: netdev, linux-kernel, Haishuang Yan
When __ip6_tnl_rcv fails, the tun_dst won't be freed, so call
dst_release to free it in error code path.
Fixes: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels")
CC: Alexei Starovoitov <ast@fb.com>
Tested-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
Changes since v4:
* Add the the missing Fixes information
* Free tun_dst from error code path
* Add tester information
---
net/ipv6/ip6_tunnel.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 9b37f97..ef99d59 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -859,6 +859,8 @@ static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,
return 0;
drop:
+ if (tun_dst)
+ dst_release((struct dst_entry *)tun_dst);
kfree_skb(skb);
return 0;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv
2017-06-15 2:29 [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv Haishuang Yan
2017-06-15 2:29 ` [PATCH v4 2/2] ip6_tunnel: fix potential issue in __ip6_tnl_rcv Haishuang Yan
@ 2017-06-16 16:02 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2017-06-16 16:02 UTC (permalink / raw)
To: yanhaishuang; +Cc: edumazet, pshelar, ast, netdev, linux-kernel
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Date: Thu, 15 Jun 2017 10:29:29 +0800
> When ip_tunnel_rcv fails, the tun_dst won't be freed, so call
> dst_release to free it in error code path.
>
> Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
> Acked-by: Eric Dumazet <edumazet@google.com>
> Acked-by: Pravin B Shelar <pshelar@ovn.org>
> Tested-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v4 2/2] ip6_tunnel: fix potential issue in __ip6_tnl_rcv
2017-06-15 2:29 ` [PATCH v4 2/2] ip6_tunnel: fix potential issue in __ip6_tnl_rcv Haishuang Yan
@ 2017-06-16 16:02 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2017-06-16 16:02 UTC (permalink / raw)
To: yanhaishuang; +Cc: edumazet, pshelar, ast, netdev, linux-kernel
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Date: Thu, 15 Jun 2017 10:29:30 +0800
> When __ip6_tnl_rcv fails, the tun_dst won't be freed, so call
> dst_release to free it in error code path.
>
> Fixes: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels")
> CC: Alexei Starovoitov <ast@fb.com>
> Tested-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-16 16:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-15 2:29 [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv Haishuang Yan
2017-06-15 2:29 ` [PATCH v4 2/2] ip6_tunnel: fix potential issue in __ip6_tnl_rcv Haishuang Yan
2017-06-16 16:02 ` David Miller
2017-06-16 16:02 ` [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).