| Message ID | 1496896364-27153-1-git-send-email-yanhaishuang@cmss.chinamobile.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
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>
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>
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; }
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(+)