From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
Chris Wedgwood <reviews@ml.cw.f00f.org>,
Michael Krufky <mkrufky@linuxtv.org>,
Chuck Ebbert <cebbert@redhat.com>,
Domenico Andreoli <cavokz@gmail.com>, Willy Tarreau <w@1wt.eu>,
Rodrigo Rubira Branco <rbranco@la.checkpoint.com>,
Jake Edge <jake@lwn.net>, Eugene Teo <eteo@redhat.com>,
torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk, netfilter-devel@vger.kernel.org,
Patrick McHardy <kaber@trash.net>,
davem@davemloft.net, Alexey Dobriyan <adobriyan@gmail.com>,
Jan Engelhardt <jengelh@medozas.de>
Subject: [patch 16/27] netfilter: xt_iprange: fix range inversion match
Date: Thu, 23 Oct 2008 21:34:43 -0700 [thread overview]
Message-ID: <20081024043443.GQ30828@kroah.com> (raw)
In-Reply-To: <20081024043303.GA30828@kroah.com>
[-- Attachment #1: netfilter-xt_iprange-fix-range-inversion-match.patch --]
[-- Type: text/plain, Size: 2073 bytes --]
2.6.27-stable review patch. If anyone has any objections, please let us
know.
------------------
From: Alexey Dobriyan <adobriyan@gmail.com>
netfilter: xt_iprange: fix range inversion match
Upstream commit 6def1eb48:
Inverted IPv4 v1 and IPv6 v0 matches don't match anything since 2.6.25-rc1!
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
net/netfilter/xt_iprange.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/net/netfilter/xt_iprange.c
+++ b/net/netfilter/xt_iprange.c
@@ -67,7 +67,7 @@ iprange_mt4(const struct sk_buff *skb, c
if (info->flags & IPRANGE_SRC) {
m = ntohl(iph->saddr) < ntohl(info->src_min.ip);
m |= ntohl(iph->saddr) > ntohl(info->src_max.ip);
- m ^= info->flags & IPRANGE_SRC_INV;
+ m ^= !!(info->flags & IPRANGE_SRC_INV);
if (m) {
pr_debug("src IP " NIPQUAD_FMT " NOT in range %s"
NIPQUAD_FMT "-" NIPQUAD_FMT "\n",
@@ -81,7 +81,7 @@ iprange_mt4(const struct sk_buff *skb, c
if (info->flags & IPRANGE_DST) {
m = ntohl(iph->daddr) < ntohl(info->dst_min.ip);
m |= ntohl(iph->daddr) > ntohl(info->dst_max.ip);
- m ^= info->flags & IPRANGE_DST_INV;
+ m ^= !!(info->flags & IPRANGE_DST_INV);
if (m) {
pr_debug("dst IP " NIPQUAD_FMT " NOT in range %s"
NIPQUAD_FMT "-" NIPQUAD_FMT "\n",
@@ -123,14 +123,14 @@ iprange_mt6(const struct sk_buff *skb, c
if (info->flags & IPRANGE_SRC) {
m = iprange_ipv6_sub(&iph->saddr, &info->src_min.in6) < 0;
m |= iprange_ipv6_sub(&iph->saddr, &info->src_max.in6) > 0;
- m ^= info->flags & IPRANGE_SRC_INV;
+ m ^= !!(info->flags & IPRANGE_SRC_INV);
if (m)
return false;
}
if (info->flags & IPRANGE_DST) {
m = iprange_ipv6_sub(&iph->daddr, &info->dst_min.in6) < 0;
m |= iprange_ipv6_sub(&iph->daddr, &info->dst_max.in6) > 0;
- m ^= info->flags & IPRANGE_DST_INV;
+ m ^= !!(info->flags & IPRANGE_DST_INV);
if (m)
return false;
}
--
next prev parent reply other threads:[~2008-10-24 4:45 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20081024042023.054190751@mini.kroah.org>
2008-10-24 4:33 ` [patch 00/27] 2.6.27.4-stable review Greg KH
2008-10-24 4:33 ` [patch 01/27] gpiolib: fix oops in gpio_get_value_cansleep() Greg KH
2008-10-24 4:33 ` [patch 02/27] edac cell: fix incorrect edac_mode Greg KH
2008-10-24 4:33 ` [patch 03/27] x86 ACPI: fix breakage of resume on 64-bit UP systems with SMP kernel Greg KH
2008-10-24 4:33 ` [patch 04/27] sched: fix the wrong mask_len Greg KH
2008-10-24 4:33 ` [patch 05/27] USB: cdc-wdm: make module autoload work Greg KH
2008-10-24 4:33 ` [patch 06/27] USB: dont rebind drivers after failed resume or reset Greg KH
2008-10-24 4:33 ` [patch 07/27] USB: fix memory leak in cdc-acm Greg KH
2008-10-24 4:34 ` [patch 08/27] USB: Speedtouch: add pre_reset and post_reset routines Greg KH
2008-10-24 4:34 ` [patch 09/27] dm kcopyd: avoid queue shuffle Greg KH
2008-10-24 4:34 ` [patch 10/27] dm snapshot: fix primary_pe race Greg KH
2008-10-24 4:34 ` [patch 11/27] dm exception store: refactor zero_area Greg KH
2008-10-24 5:36 ` Greg KH
2008-10-25 1:40 ` Mikulas Patocka
2008-10-25 20:28 ` Greg KH
2008-10-24 4:34 ` [patch 12/27] dm exception store: fix misordered writes Greg KH
2008-10-24 4:34 ` [patch 13/27] amd_iommu: fix nasty bug that caused ILLEGAL_DEVICE_TABLE_ENTRY errors Greg KH
2008-10-24 4:34 ` [patch 14/27] CIFS: fix saving of resume key before CIFSFindNext Greg KH
2008-10-24 4:34 ` [patch 15/27] ext: Avoid printk floods in the face of directory corruption (CVE-2008-3528) Greg KH
2008-10-24 4:34 ` Greg KH [this message]
2008-10-24 4:34 ` [patch 17/27] netfilter: snmp nat leaks memory in case of failure Greg KH
2008-10-24 4:34 ` [patch 18/27] netfilter: restore lost ifdef guarding defrag exception Greg KH
2008-10-24 4:34 ` [patch 19/27] anon_vma_prepare: properly lock even newly allocated entries Greg KH
2008-10-24 4:34 ` [patch 20/27] hvc_console: Fix free_irq in spinlocked section Greg KH
2008-10-24 4:35 ` [patch 21/27] ACPI Suspend: Enable ACPI during resume if SCI_EN is not set Greg KH
2008-10-24 4:35 ` [patch 22/27] ACPI suspend: Blacklist HP xw4600 Workstation for old code ordering Greg KH
2008-10-24 4:35 ` [patch 23/27] ACPI suspend: Always use the 32-bit waking vector Greg KH
2008-10-24 4:35 ` [patch 24/27] proc: fix vma display mismatch between /proc/pid/{maps,smaps} Greg KH
2008-10-24 4:35 ` [patch 25/27] SCSI: scsi_dh: add Dell product information into rdac device handler Greg KH
2008-10-24 4:35 ` [patch 26/27] PCI hotplug: cpqphp: fix kernel NULL pointer dereference Greg KH
2008-10-24 4:35 ` [patch 27/27] ath5k: fix suspend-related oops on rmmod Greg KH
2008-10-24 20:36 ` Elias Oltmanns
2008-10-24 21:10 ` Bob Copeland
2008-10-24 21:28 ` Greg KH
2008-10-24 5:41 ` [patch 00/27] 2.6.27.4-stable review Greg KH
2008-10-24 21:38 ` [stable] " Greg KH
2008-10-24 21:40 ` [patch 28/27] V4L/DVB (9300): pvrusb2: Fix deadlock problem Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081024043443.GQ30828@kroah.com \
--to=gregkh@suse.de \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=cavokz@gmail.com \
--cc=cebbert@redhat.com \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=davem@davemloft.net \
--cc=eteo@redhat.com \
--cc=jake@lwn.net \
--cc=jengelh@medozas.de \
--cc=jmforbes@linuxtx.org \
--cc=kaber@trash.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mkrufky@linuxtv.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=rbranco@la.checkpoint.com \
--cc=rdunlap@xenotime.net \
--cc=reviews@ml.cw.f00f.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=w@1wt.eu \
--cc=zwane@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).