diff options
| author | Shan Wei <shanwei@cn.fujitsu.com> | 2010-01-26 02:40:38 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-09 13:24:20 -0800 |
| commit | 89c5e8fb2127d908006ff47cda51708fb31151ec (patch) | |
| tree | e6fea15b23294a5fc846eb1d04e9bf148b32a3ed | |
| parent | 88e762503264d0d6bc0cf27d44be0f30cc8a8972 (diff) | |
| download | linux-stable-89c5e8fb2127d908006ff47cda51708fb31151ec.tar.gz linux-stable-89c5e8fb2127d908006ff47cda51708fb31151ec.tar.bz2 linux-stable-89c5e8fb2127d908006ff47cda51708fb31151ec.zip | |
ipv6: conntrack: Add member of user to nf_ct_frag6_queue structure
commit c92b544bd5d8e7ed7d81c77bbecab6df2a95aa53 upstream.
The commit 0b5ccb2(title:ipv6: reassembly: use seperate reassembly queues for
conntrack and local delivery) has broken the saddr&&daddr member of
nf_ct_frag6_queue when creating new queue. And then hash value
generated by nf_hashfn() was not equal with that generated by fq_find().
So, a new received fragment can't be inserted to right queue.
The patch fixes the bug with adding member of user to nf_ct_frag6_queue structure.
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Pascal Hambourg <pascal@plouf.fr.eu.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 6011bad3436b..e41f735b0829 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -64,6 +64,7 @@ struct nf_ct_frag6_queue struct inet_frag_queue q; __be32 id; /* fragment id */ + u32 user; struct in6_addr saddr; struct in6_addr daddr; |