Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1660637

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

Show all headers | View raw

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.

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.com390e>
---
 net/ipv4/ip_tunnel.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv Haishuang Yan <yanhaishuang@cmss.chinamobile.com> - 2017-06-08 03:00 +0200
  Re: [PATCH v2 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv Pravin Shelar <pshelar@ovn.org> - 2017-06-08 04:30 +0200
    Re: [PATCH v2 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv 严海双 <yanhaishuang@cmss.chinamobile.com> - 2017-06-08 05:10 +0200
    Re: [PATCH v2 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv Eric Dumazet <eric.dumazet@gmail.com> - 2017-06-08 05:20 +0200
      Re: [PATCH v2 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv Pravin Shelar <pshelar@ovn.org> - 2017-06-08 06:10 +0200
  Re: [PATCH v2 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv Eric Dumazet <eric.dumazet@gmail.com> - 2017-06-08 04:30 +0200

csiph-web