diff options
| author | Sasha Levin <sashal@kernel.org> | 2018-10-31 11:04:10 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-04 14:51:51 +0100 |
| commit | f1f040bf29b71489ebdd1b9b44bbe3f1ecd14c56 (patch) | |
| tree | b567b1587b15c93a95b2b4485c5359a687f8e9c8 /net | |
| parent | d496cdeede289a5c97447fb799db67592bb010b0 (diff) | |
| download | linux-stable-f1f040bf29b71489ebdd1b9b44bbe3f1ecd14c56.tar.gz linux-stable-f1f040bf29b71489ebdd1b9b44bbe3f1ecd14c56.tar.bz2 linux-stable-f1f040bf29b71489ebdd1b9b44bbe3f1ecd14c56.zip | |
Revert "netfilter: ipv6: nf_defrag: drop skb dst before queueing"
This reverts commit 84379c9afe011020e797e3f50a662b08a6355dcf.
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')
| -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 e4d9e6976d3c..a452d99c9f52 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -585,8 +585,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); |