Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1660730 > unrolled thread
| Started by | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> |
|---|---|
| First post | 2017-06-08 06:40 +0200 |
| Last post | 2017-06-08 23:50 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH v3 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv Haishuang Yan <yanhaishuang@cmss.chinamobile.com> - 2017-06-08 06:40 +0200
Re: [PATCH v3 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv Eric Dumazet <eric.dumazet@gmail.com> - 2017-06-08 07:00 +0200
Re: [PATCH v3 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv Pravin Shelar <pshelar@ovn.org> - 2017-06-08 23:50 +0200
| From | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> |
|---|---|
| Date | 2017-06-08 06:40 +0200 |
| Subject | [PATCH v3 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv |
| Message-ID | <tPXoJ-7V3-3@gated-at.bofh.it> |
When ip_tunnel_rcv fails, the tun_dst won't be freed, so call
dst_release to free it in error code path.
CC: Pravin B Shelar <pshelar@nicira.com>
Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
Changes in v2:
- Add the the missing Fixes information
Changes in v3:
- Free tun_dst from error code path
---
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
[toc] | [next] | [standalone]
| From | Eric Dumazet <eric.dumazet@gmail.com> |
|---|---|
| Date | 2017-06-08 07:00 +0200 |
| Message-ID | <tPXI5-83V-3@gated-at.bofh.it> |
| In reply to | #1660730 |
On Thu, 2017-06-08 at 12:32 +0800, Haishuang Yan wrote:
> When ip_tunnel_rcv fails, the tun_dst won't be freed, so call
> dst_release to free it in error code path.
>
> CC: Pravin B Shelar <pshelar@nicira.com>
> Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
>
> ---
> Changes in v2:
> - Add the the missing Fixes information
> Changes in v3:
> - Free tun_dst from error code path
> ---
> 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;
> }
Acked-by: Eric Dumazet <edumazet@google.com>
[toc] | [prev] | [next] | [standalone]
| From | Pravin Shelar <pshelar@ovn.org> |
|---|---|
| Date | 2017-06-08 23:50 +0200 |
| Message-ID | <tQdtv-1cR-3@gated-at.bofh.it> |
| In reply to | #1660730 |
On Wed, Jun 7, 2017 at 9:32 PM, Haishuang Yan
<yanhaishuang@cmss.chinamobile.com> wrote:
> When ip_tunnel_rcv fails, the tun_dst won't be freed, so call
> dst_release to free it in error code path.
>
> CC: Pravin B Shelar <pshelar@nicira.com>
> Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
>
> ---
> Changes in v2:
> - Add the the missing Fixes information
> Changes in v3:
> - Free tun_dst from error code path
> ---
Acked-by: Pravin B Shelar <pshelar@ovn.org>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web