aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_tunnel_core.c
diff options
context:
space:
mode:
authorPravin B Shelar <pshelar@nicira.com>2014-03-23 22:06:36 -0700
committerDavid S. Miller <davem@davemloft.net>2014-03-26 15:18:40 -0400
commitfbd02dd405d0724a0f25897ed4a6813297c9b96f (patch)
tree4ebae2c7d156ffa99c1c6ec2d14a8061d0a7b742 /net/ipv4/ip_tunnel_core.c
parentMerge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux (diff)
downloadlinux-dev-fbd02dd405d0724a0f25897ed4a6813297c9b96f.tar.xz
linux-dev-fbd02dd405d0724a0f25897ed4a6813297c9b96f.zip
ip_tunnel: Fix dst ref-count.
Commit 10ddceb22ba (ip_tunnel:multicast process cause panic due to skb->_skb_refdst NULL pointer) removed dst-drop call from ip-tunnel-recv. Following commit reintroduce dst-drop and fix the original bug by checking loopback packet before releasing dst. Original bug: https://bugzilla.kernel.org/show_bug.cgi?id=70681 CC: Xin Long <lucien.xin@gmail.com> Signed-off-by: Pravin B Shelar <pshelar@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel_core.c')
-rw-r--r--net/ipv4/ip_tunnel_core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 6f847dd56dbc..8d69626f2206 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -108,6 +108,7 @@ int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto)
nf_reset(skb);
secpath_reset(skb);
skb_clear_hash_if_not_l4(skb);
+ skb_dst_drop(skb);
skb->vlan_tci = 0;
skb_set_queue_mapping(skb, 0);
skb->pkt_type = PACKET_HOST;