* netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal() @ 2013-11-14 15:41 Dave Jones 2013-11-25 21:45 ` Pablo Neira Ayuso 0 siblings, 1 reply; 6+ messages in thread From: Dave Jones @ 2013-11-14 15:41 UTC (permalink / raw) To: netdev; +Cc: oliver 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> 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal() 2013-11-14 15:41 netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal() Dave Jones @ 2013-11-25 21:45 ` Pablo Neira Ayuso 2013-12-07 12:23 ` Oliver 0 siblings, 1 reply; 6+ messages in thread From: Pablo Neira Ayuso @ 2013-11-25 21:45 UTC (permalink / raw) To: Dave Jones; +Cc: netdev, oliver, netfilter-devel On Thu, Nov 14, 2013 at 10:41:01AM -0500, Dave Jones wrote: > 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. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal() 2013-11-25 21:45 ` Pablo Neira Ayuso @ 2013-12-07 12:23 ` Oliver 2013-12-07 19:53 ` Jozsef Kadlecsik 0 siblings, 1 reply; 6+ messages in thread From: Oliver @ 2013-12-07 12:23 UTC (permalink / raw) To: Pablo Neira Ayuso; +Cc: Dave Jones, netdev, netfilter-devel On Monday 25 November 2013 22:45:11 Pablo Neira Ayuso wrote: > On Thu, Nov 14, 2013 at 10:41:01AM -0500, Dave Jones wrote: > > 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. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal() 2013-12-07 12:23 ` Oliver @ 2013-12-07 19:53 ` Jozsef Kadlecsik 2013-12-07 22:34 ` Pablo Neira Ayuso 0 siblings, 1 reply; 6+ messages in thread From: Jozsef Kadlecsik @ 2013-12-07 19:53 UTC (permalink / raw) To: Oliver; +Cc: Pablo Neira Ayuso, Dave Jones, netdev, netfilter-devel On Sat, 7 Dec 2013, Oliver wrote: > On Monday 25 November 2013 22:45:11 Pablo Neira Ayuso wrote: > > On Thu, Nov 14, 2013 at 10:41:01AM -0500, Dave Jones wrote: > > > 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 : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal() 2013-12-07 19:53 ` Jozsef Kadlecsik @ 2013-12-07 22:34 ` Pablo Neira Ayuso 2013-12-08 9:31 ` Jozsef Kadlecsik 0 siblings, 1 reply; 6+ messages in thread From: Pablo Neira Ayuso @ 2013-12-07 22:34 UTC (permalink / raw) To: Jozsef Kadlecsik; +Cc: Oliver, Dave Jones, netdev, netfilter-devel On Sat, Dec 07, 2013 at 08:53:52PM +0100, Jozsef Kadlecsik wrote: > On Sat, 7 Dec 2013, Oliver wrote: > > > On Monday 25 November 2013 22:45:11 Pablo Neira Ayuso wrote: > > > On Thu, Nov 14, 2013 at 10:41:01AM -0500, Dave Jones wrote: > > > > 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. 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/ ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal() 2013-12-07 22:34 ` Pablo Neira Ayuso @ 2013-12-08 9:31 ` Jozsef Kadlecsik 0 siblings, 0 replies; 6+ messages in thread From: Jozsef Kadlecsik @ 2013-12-08 9:31 UTC (permalink / raw) To: Pablo Neira Ayuso; +Cc: Oliver, Dave Jones, netdev, netfilter-devel On Sat, 7 Dec 2013, Pablo Neira Ayuso wrote: > On Sat, Dec 07, 2013 at 08:53:52PM +0100, Jozsef Kadlecsik wrote: > > On Sat, 7 Dec 2013, Oliver wrote: > > > > > On Monday 25 November 2013 22:45:11 Pablo Neira Ayuso wrote: > > > > On Thu, Nov 14, 2013 at 10:41:01AM -0500, Dave Jones wrote: > > > > > 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. > > 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 : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-08 9:31 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-11-14 15:41 netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal() Dave Jones 2013-11-25 21:45 ` Pablo Neira Ayuso 2013-12-07 12:23 ` Oliver 2013-12-07 19:53 ` Jozsef Kadlecsik 2013-12-07 22:34 ` Pablo Neira Ayuso 2013-12-08 9:31 ` Jozsef Kadlecsik
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).