From: Shan Wei Date: Tue, 26 Jan 2010 02:40:38 +0000 (+0000) Subject: ipv6: conntrack: Add member of user to nf_ct_frag6_queue structure X-Git-Tag: firefly_0821_release~10186^2~2135 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c191a795447dd22e3f504bdc627ec79126629697;p=firefly-linux-kernel-4.4.55.git ipv6: conntrack: Add member of user to nf_ct_frag6_queue structure [ Upstream commit c92b544bd5d8e7ed7d81c77bbecab6df2a95aa53 ] 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 Acked-by: Patrick McHardy Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 4b6a539cb87a..bfc8737292bd 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -63,6 +63,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;