| Message ID | 1496844976-15282-1-git-send-email-yanhaishuang@cmss.chinamobile.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, 2017-06-07 at 22:16 +0800, Haishuang Yan wrote: > When ip_tunnel_rcv fails, the tun_dst won't be freed, so move > skb_dst_set to begin and tun_dst would be freed by kfree_skb. > > Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> > --- Please add the missing Fixes: tag and CC author of the patch that added this bug, so that he has a chance to comment and avoid future similar bugs. Thanks.
> On 7 Jun 2017, at 10:48 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote: > > On Wed, 2017-06-07 at 22:16 +0800, Haishuang Yan wrote: >> When ip_tunnel_rcv fails, the tun_dst won't be freed, so move >> skb_dst_set to begin and tun_dst would be freed by kfree_skb. >> >> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> >> --- > > Please add the missing Fixes: tag and CC author of the patch that added > this bug, so that he has a chance to comment and avoid future similar > bugs. > > Thanks. > > > Ok, I will add these information in v2 commit. Thanks.
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index b878ecb..27fc20f 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -386,6 +386,9 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb, const struct iphdr *iph = ip_hdr(skb); int err; + if (tun_dst) + skb_dst_set(skb, (struct dst_entry *)tun_dst); + #ifdef CONFIG_NET_IPGRE_BROADCAST if (ipv4_is_multicast(iph->daddr)) { tunnel->dev->stats.multicast++; @@ -439,9 +442,6 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb, skb->dev = tunnel->dev; } - if (tun_dst) - skb_dst_set(skb, (struct dst_entry *)tun_dst); - gro_cells_receive(&tunnel->gro_cells, skb); return 0;
When ip_tunnel_rcv fails, the tun_dst won't be freed, so move skb_dst_set to begin and tun_dst would be freed by kfree_skb. Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> --- net/ipv4/ip_tunnel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)