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

[patch 18/27] netfilter: restore lost ifdef guarding defrag exception

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Greg KH
Subject: [patch 18/27] netfilter: restore lost ifdef guarding defrag exception
Date: Thursday, October 23, 2008 - 9:34 pm

2.6.27-stable review patch.  If anyone has any objections, please let us 
know.

------------------
From: Patrick McHardy <kaber@trash.net>

netfilter: restore lost #ifdef guarding defrag exception

Upstream commit 38f7ac3eb:

Nir Tzachar <nir.tzachar@gmail.com> reported a warning when sending
fragments over loopback with NAT:

[ 6658.338121] WARNING: at net/ipv4/netfilter/nf_nat_standalone.c:89 nf_nat_fn+0x33/0x155()

The reason is that defragmentation is skipped for already tracked connections.
This is wrong in combination with NAT and ip_conntrack actually had some ifdefs
to avoid this behaviour when NAT is compiled in.

The entire "optimization" may seem a bit silly, for now simply restoring the
lost #ifdef is the easiest solution until we can come up with something better.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -150,10 +150,12 @@ static unsigned int ipv4_conntrack_defra
 					  const struct net_device *out,
 					  int (*okfn)(struct sk_buff *))
 {
+#if !defined(CONFIG_NF_NAT) && !defined(CONFIG_NF_NAT_MODULE)
 	/* Previously seen (loopback)?  Ignore.  Do this before
 	   fragment check. */
 	if (skb->nfct)
 		return NF_ACCEPT;
+#endif
 
 	/* Gather fragments. */
 	if (ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) {

-- 
--
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)