diff options
| author | Sasha Levin <sashal@kernel.org> | 2018-10-31 11:05:19 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-04 14:52:47 +0100 |
| commit | ac7c2bb59870b8fd41c09502e73e72fcb63b85c3 (patch) | |
| tree | cfea7e54ad01ce9ae0d9de88a8d6c0ced348770c /net/ipv6 | |
| parent | ee66ad5896aef9b67b7b1e3db6fa9430b907fa58 (diff) | |
| download | linux-rt-ac7c2bb59870b8fd41c09502e73e72fcb63b85c3.tar.gz | |
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>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 2ed8536e10b6..611d406c4656 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); |