]> git.karo-electronics.de Git - karo-tx-linux.git/commit
ipv6: conntrack: Add member of user to nf_ct_frag6_queue structure
authorShan Wei <shanwei@cn.fujitsu.com>
Tue, 26 Jan 2010 02:40:38 +0000 (02:40 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 9 Dec 2010 21:24:20 +0000 (13:24 -0800)
commit89c5e8fb2127d908006ff47cda51708fb31151ec
treee6fea15b23294a5fc846eb1d04e9bf148b32a3ed
parent88e762503264d0d6bc0cf27d44be0f30cc8a8972
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>
net/ipv6/netfilter/nf_conntrack_reasm.c