Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ea46c9c authored by Yasuyuki Kozakai's avatar Yasuyuki Kozakai Committed by David S. Miller
Browse files

[NETFILTER]: nf_conntrack: use ipv6_addr_equal in nf_ct_reasm 



Signed-off-by: default avatarYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f2ad52c9

net/ipv6/netfilter/nf_conntrack_reasm.c

+4 −4
Original line number Diff line number Diff line
@@ -313,8 +313,8 @@ static struct nf_ct_frag6_queue *nf_ct_frag6_intern(unsigned int hash, 
#ifdef CONFIG_SMP

	hlist_for_each_entry(fq, n, &nf_ct_frag6_hash[hash], list) {

		if (fq->id == fq_in->id && 

		    !ipv6_addr_cmp(&fq_in->saddr, &fq->saddr) &&

		    !ipv6_addr_cmp(&fq_in->daddr, &fq->daddr)) {

		    ipv6_addr_equal(&fq_in->saddr, &fq->saddr) &&

		    ipv6_addr_equal(&fq_in->daddr, &fq->daddr)) {

			atomic_inc(&fq->refcnt);

			write_unlock(&nf_ct_frag6_lock);

			fq_in->last_in |= COMPLETE;
@@ -376,8 +376,8 @@ fq_find(u32 id, struct in6_addr *src, struct in6_addr *dst) 
	read_lock(&nf_ct_frag6_lock);

	hlist_for_each_entry(fq, n, &nf_ct_frag6_hash[hash], list) {

		if (fq->id == id && 

		    !ipv6_addr_cmp(src, &fq->saddr) &&

		    !ipv6_addr_cmp(dst, &fq->daddr)) {

		    ipv6_addr_equal(src, &fq->saddr) &&

		    ipv6_addr_equal(dst, &fq->daddr)) {

			atomic_inc(&fq->refcnt);

			read_unlock(&nf_ct_frag6_lock);

			return fq;