Skip to contentSkip to conversation

netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal()

PATCH Applied Dave Jones 4 participants 6 messages Nov 14, 2013 – Dec 8, 2013

Subsystems (3)
lore
Share & tools
lore

Dave Jones

author
#0 lore raw

Both sides of the comparison are the same, looks like a cut-and-paste error.

Spotted by Coverity.

net/netfilter/ipset/ip_set_hash_netnet.c +1 -1
index 2bc2dec20b00..6226803fc490 100644
@@ -59,7 +59,7 @@ hash_netnet4_data_equal(const struct hash_netnet4_elem *ip1,
 		     u32 *multi)
 {
 	return ip1->ipcmp == ip2->ipcmp &&
-	       ip2->ccmp == ip2->ccmp;
+	       ip1->ccmp == ip2->ccmp;
 }
 
 static inline int
maintainer Applied
#1 lore raw
Quoted 3 lines · Dave Jones

Both sides of the comparison are the same, looks like a cut-and-paste error.

Spotted by Coverity.

Applied, thanks Dave.

Please, cc netfilter-devel for netfilter patches next time.

#2 lore raw
Quoted 3 lines · On Monday 25 November 2013 22:45:11 Pablo Neira Ayuso wrote:
Quoted 2 lines · Dave Jones

Both sides of the comparison are the same, looks like a cut-and-paste error.

Just a typo unfortunately.

The change should definitely make its way into mainline before 3.13 gets released - is it on track to be pulled into davem's net tree or should I get that sorted out myself?

Cheers,
Oliver.

#3 lore raw
Quoted 10 lines · Oliver
Quoted 3 lines · On Monday 25 November 2013 22:45:11 Pablo Neira Ayuso wrote:
Quoted 2 lines · Dave Jones

Both sides of the comparison are the same, looks like a cut-and-paste error.

Just a typo unfortunately.

The change should definitely make its way into mainline before 3.13 gets released - is it on track to be pulled into davem's net tree or should I get that sorted out myself?

I'm going to submit the patch to Pablo at the beginning of next week, so it'll follow the normal track.

Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences

          H-1525 Budapest 114, POB. 49, Hungary
#4 lore raw
Quoted 7 lines · Jozsef Kadlecsik
Quoted 5 lines · Oliver
Quoted 3 lines · On Monday 25 November 2013 22:45:11 Pablo Neira Ayuso wrote:
Quoted 2 lines · Dave Jones

Both sides of the comparison are the same, looks like a cut-and-paste error.

Quoted 8 lines
Quoted 5 lines

Just a typo unfortunately.

The change should definitely make its way into mainline before 3.13 gets released - is it on track to be pulled into davem's net tree or should I get that sorted out myself?

I'm going to submit the patch to Pablo at the beginning of next week, so it'll follow the normal track.

JFYI, I applied this already:

http://www.spinics.net/lists/netfilter-devel/msg29031.html

If unsure, please check my tree:

http://git.kernel.org/cgit/linux/kernel/git/pablo/nf.git/

#5 lore raw
Quoted 17 lines · Pablo Neira Ayuso
Quoted 7 lines · Jozsef Kadlecsik
Quoted 5 lines · Oliver
Quoted 3 lines · On Monday 25 November 2013 22:45:11 Pablo Neira Ayuso wrote:
Quoted 2 lines · Dave Jones

Both sides of the comparison are the same, looks like a cut-and-paste error.

Quoted 8 lines
Quoted 5 lines

Just a typo unfortunately.

The change should definitely make its way into mainline before 3.13 gets released - is it on track to be pulled into davem's net tree or should I get that sorted out myself?

I'm going to submit the patch to Pablo at the beginning of next week, so it'll follow the normal track.

Quoted 7 lines

JFYI, I applied this already:

http://www.spinics.net/lists/netfilter-devel/msg29031.html

If unsure, please check my tree:

http://git.kernel.org/cgit/linux/kernel/git/pablo/nf.git/

Great, thanks indeed!

Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences

          H-1525 Budapest 114, POB. 49, Hungary