Home » Mailing list archives » linux-kernel » 2008 » October » 24

[patch 16/27] netfilter: xt_iprange: fix range inversion match

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Greg KH
Subject: [patch 16/27] netfilter: xt_iprange: fix range inversion match
Date: Thursday, October 23, 2008 - 9:34 pm

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;
 	}

-- 
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[patch 00/27] 2.6.27.4-stable review, Greg KH, (Thu Oct 23, 9:33 pm)
[patch 01/27] gpiolib: fix oops in gpio_get_value_cansleep(), Greg KH, (Thu Oct 23, 9:33 pm)
[patch 02/27] edac cell: fix incorrect edac_mode, Greg KH, (Thu Oct 23, 9:33 pm)
[patch 03/27] x86 ACPI: fix breakage of resume on 64-bit U ..., Greg KH, (Thu Oct 23, 9:33 pm)
[patch 04/27] sched: fix the wrong mask_len, Greg KH, (Thu Oct 23, 9:33 pm)
[patch 05/27] USB: cdc-wdm: make module autoload work, Greg KH, (Thu Oct 23, 9:33 pm)
[patch 06/27] USB: dont rebind drivers after failed resume ..., Greg KH, (Thu Oct 23, 9:33 pm)
[patch 07/27] USB: fix memory leak in cdc-acm, Greg KH, (Thu Oct 23, 9:33 pm)
[patch 08/27] USB: Speedtouch: add pre_reset and post_rese ..., Greg KH, (Thu Oct 23, 9:34 pm)
[patch 09/27] dm kcopyd: avoid queue shuffle, Greg KH, (Thu Oct 23, 9:34 pm)
[patch 10/27] dm snapshot: fix primary_pe race, Greg KH, (Thu Oct 23, 9:34 pm)
[patch 11/27] dm exception store: refactor zero_area, Greg KH, (Thu Oct 23, 9:34 pm)
[patch 12/27] dm exception store: fix misordered writes, Greg KH, (Thu Oct 23, 9:34 pm)
[patch 13/27] amd_iommu: fix nasty bug that caused ILLEGAL ..., Greg KH, (Thu Oct 23, 9:34 pm)
[patch 14/27] CIFS: fix saving of resume key before CIFSFi ..., Greg KH, (Thu Oct 23, 9:34 pm)
[patch 15/27] ext: Avoid printk floods in the face of dire ..., Greg KH, (Thu Oct 23, 9:34 pm)
[patch 16/27] netfilter: xt_iprange: fix range inversion match, Greg KH, (Thu Oct 23, 9:34 pm)
[patch 17/27] netfilter: snmp nat leaks memory in case of ..., Greg KH, (Thu Oct 23, 9:34 pm)
[patch 18/27] netfilter: restore lost ifdef guarding defra ..., Greg KH, (Thu Oct 23, 9:34 pm)
[patch 19/27] anon_vma_prepare: properly lock even newly a ..., Greg KH, (Thu Oct 23, 9:34 pm)
[patch 20/27] hvc_console: Fix free_irq in spinlocked section, Greg KH, (Thu Oct 23, 9:34 pm)
[patch 21/27] ACPI Suspend: Enable ACPI during resume if S ..., Greg KH, (Thu Oct 23, 9:35 pm)
[patch 22/27] ACPI suspend: Blacklist HP xw4600 Workstatio ..., Greg KH, (Thu Oct 23, 9:35 pm)
[patch 23/27] ACPI suspend: Always use the 32-bit waking v ..., Greg KH, (Thu Oct 23, 9:35 pm)
[patch 24/27] proc: fix vma display mismatch between /proc ..., Greg KH, (Thu Oct 23, 9:35 pm)
[patch 25/27] SCSI: scsi_dh: add Dell product information ..., Greg KH, (Thu Oct 23, 9:35 pm)
[patch 26/27] PCI hotplug: cpqphp: fix kernel NULL pointer ..., Greg KH, (Thu Oct 23, 9:35 pm)
[patch 27/27] ath5k: fix suspend-related oops on rmmod, Greg KH, (Thu Oct 23, 9:35 pm)
Re: [patch 11/27] dm exception store: refactor zero_area, Greg KH, (Thu Oct 23, 10:36 pm)
Re: [patch 00/27] 2.6.27.4-stable review, Greg KH, (Thu Oct 23, 10:41 pm)
Re: [stable] [patch 00/27] 2.6.27.4-stable review, Greg KH, (Fri Oct 24, 2:38 pm)
[patch 28/27] V4L/DVB (9300): pvrusb2: Fix deadlock problem, Greg KH, (Fri Oct 24, 2:40 pm)
Re: [patch 11/27] dm exception store: refactor zero_area, Mikulas Patocka, (Fri Oct 24, 6:40 pm)
Re: [patch 11/27] dm exception store: refactor zero_area, Greg KH, (Sat Oct 25, 1:28 pm)