From: Dave Jones <davej@redhat.com>
Date: Thu, 14 Nov 2013 15:41:01 +0000 (-0500)
Subject: netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b49faea7655ec10ade15d7d007e4218ca578a513;p=linux-beck.git

netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal()

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

Spotted by Coverity.

Signed-off-by: Dave Jones <davej@fedoraproject.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/net/netfilter/ipset/ip_set_hash_netnet.c b/net/netfilter/ipset/ip_set_hash_netnet.c
index 2bc2dec20b00..6226803fc490 100644
--- a/net/netfilter/ipset/ip_set_hash_netnet.c
+++ b/net/netfilter/ipset/ip_set_hash_netnet.c
@@ -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