From: Sasha Levin <sashal@kernel.org>
Date: Wed, 31 Oct 2018 15:05:19 +0000 (-0400)
Subject: Revert "netfilter: ipv6: nf_defrag: drop skb dst before queueing"
X-Git-Tag: v4.14.79~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ac7c2bb59870b8fd41c09502e73e72fcb63b85c3;p=users%2Fjedix%2Flinux-maple.git

Revert "netfilter: ipv6: nf_defrag: drop skb dst before queueing"

This reverts commit 28c74ff85efd192aeca9005499ca50c24d795f61.

From Florian Westphal <fw@strlen.de>:

	It causes kernel crash for locally generated ipv6 fragments
	when netfilter ipv6 defragmentation is used.

	The faulty commit is not essential for -stable, it only
	delays netns teardown for longer than needed when that netns
	still has ipv6 frags queued.  Much better than crash :-/

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 2ed8536e10b64..611d406c4656d 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -598,8 +598,6 @@ int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user)
 	    fq->q.meat == fq->q.len &&
 	    nf_ct_frag6_reasm(fq, skb, dev))
 		ret = 0;
-	else
-		skb_dst_drop(skb);
 
 out_unlock:
 	spin_unlock_bh(&fq->q.lock);