2017-06-15 02:29:41

by Haishuang Yan

Subject: [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv

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 <[email protected]>
Acked-by: Pravin B Shelar <[email protected]>
Tested-by: Zhang Shengju <[email protected]>
Signed-off-by: Haishuang Yan <[email protected]>

---
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

2017-06-15 02:29:57

by Haishuang Yan

Subject: [PATCH v4 2/2] ip6_tunnel: fix potential issue in __ip6_tnl_rcv

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 <[email protected]>
Tested-by: Zhang Shengju <[email protected]>
Signed-off-by: Haishuang Yan <[email protected]>

---
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

2017-06-16 16:02:10

by David Miller

Subject: Re: [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv

From: Haishuang Yan <[email protected]>
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 <[email protected]>
> Acked-by: Pravin B Shelar <[email protected]>
> Tested-by: Zhang Shengju <[email protected]>
> Signed-off-by: Haishuang Yan <[email protected]>

Applied.

2017-06-16 16:02:16

by David Miller

Subject: Re: [PATCH v4 2/2] ip6_tunnel: fix potential issue in __ip6_tnl_rcv

From: Haishuang Yan <[email protected]>
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 <[email protected]>
> Tested-by: Zhang Shengju <[email protected]>
> Signed-off-by: Haishuang Yan <[email protected]>

Applied.