Skip to contentSkip to conversation

: Netfilter fixes for 2.6.16

PATCH In review Patrick McHardy 2 participants 16 messages Feb 3, 2006 – Feb 4, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover : Netfilter fixes for 2.6.16

Hi Dave,

following are my pending netfilter bugfixes for 2.6.16, unfortunately its quite a lot, but mostly trivial patches. There are still two open bugs from the netfilter IPsec patches, the "ip_finish_output2: No header cache and no neighbour!" bug reported by Andi Kleen and a crash in xfrm4_output_finish. I'll probably have the fixes ready sometime this weekend.

#1 lore raw

PATCH 1/14 : ctnetlink: Fix subsystem used for expectation events

[NETFILTER]: ctnetlink: Fix subsystem used for expectation events

The ctnetlink expectation events should use the NFNL_SUBSYS_CTNETLINK_EXP subsystem, not NFNL_SUBSYS_CTNETLINK.

---
commit 4fd076987107a8ffa2b330d20b69a54b5ef9b554
tree 2b35cf1ee1da6023ef2e3db31aacacbaa41bb485
parent 826eeb53a6f264842200d3311d69107d2eb25f5e
author Marcus Sundberg <[email protected]> Fri, 03 Feb 2006 12:25:13 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:25:13 +0100

 net/ipv4/netfilter/ip_conntrack_netlink.c |    2 +-
 net/netfilter/nf_conntrack_netlink.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
net/ipv4/netfilter/ip_conntrack_netlink.c +1 -1
index c9ebbe0..b62518b 100644
@@ -1216,7 +1216,7 @@ static int ctnetlink_expect_event(struct
 
 	b = skb->tail;
 
-	type |= NFNL_SUBSYS_CTNETLINK << 8;
+	type |= NFNL_SUBSYS_CTNETLINK_EXP << 8;
 	nlh   = NLMSG_PUT(skb, 0, 0, type, sizeof(struct nfgenmsg));
 	nfmsg = NLMSG_DATA(nlh);
 
net/netfilter/nf_conntrack_netlink.c +1 -1
index 73ab16b..e98d00c 100644
@@ -1232,7 +1232,7 @@ static int ctnetlink_expect_event(struct
 
 	b = skb->tail;
 
-	type |= NFNL_SUBSYS_CTNETLINK << 8;
+	type |= NFNL_SUBSYS_CTNETLINK_EXP << 8;
 	nlh   = NLMSG_PUT(skb, 0, 0, type, sizeof(struct nfgenmsg));
 	nfmsg = NLMSG_DATA(nlh);
 
#2 lore raw

PATCH 2/14 : ctnetlink: add MODULE_ALIAS for expectation subsystem

In reply to Patrick McHardy

[NETFILTER]: ctnetlink: add MODULE_ALIAS for expectation subsystem

Add load-on-demand support for expectation request. eg. conntrack -L expect

---
commit 04e7be099c349b1c9646ad3cc2c409775c846334
tree 7aad9c450f279b8bd0d0b833eb015141efc8957b
parent 4fd076987107a8ffa2b330d20b69a54b5ef9b554
author Pablo Neira Ayuso <[email protected]> Fri, 03 Feb 2006 12:26:49 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:26:49 +0100

 net/ipv4/netfilter/ip_conntrack_netlink.c |    1 +
 net/netfilter/nf_conntrack_netlink.c      |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
net/ipv4/netfilter/ip_conntrack_netlink.c +1 -0
index b62518b..e0b5926 100644
@@ -1567,6 +1567,7 @@ static struct nfnetlink_subsystem ctnl_e
 };
 
 MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_CTNETLINK);
+MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_CTNETLINK_EXP);
 
 static int __init ctnetlink_init(void)
 {
net/netfilter/nf_conntrack_netlink.c +1 -0
index e98d00c..9ff3463 100644
@@ -1589,6 +1589,7 @@ static struct nfnetlink_subsystem ctnl_e
 };
 
 MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_CTNETLINK);
+MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_CTNETLINK_EXP);
 
 static int __init ctnetlink_init(void)
 {
#3 lore raw

PATCH 3/14 : nf_conntrack: check address family when finding protocol module

In reply to Patrick McHardy

[NETFILTER]: nf_conntrack: check address family when finding protocol module

__nf_conntrack_{l3}proto_find() doesn't check the passed protocol family, then it's possible to touch out of the array which has only AF_MAX items.

Spotted by Pablo Neira Ayuso.

---
commit edf3735e79f637f92f34d0848bfb6c0ea45a9349
tree bb8c411bf1f695008b7bc22f7d05d58ac5dea997
parent 04e7be099c349b1c9646ad3cc2c409775c846334
author Yasuyuki Kozakai <[email protected]> Fri, 03 Feb 2006 12:27:36 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:27:36 +0100

 include/net/netfilter/nf_conntrack_l3proto.h |   15 +++++++++------
 net/netfilter/nf_conntrack_core.c            |    2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)
include/net/netfilter/nf_conntrack_l3proto.h +9 -6
index 67856eb..dac43b1 100644
@@ -88,12 +88,6 @@ extern struct nf_conntrack_l3proto *nf_c
 extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto);
 extern void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto);
 
-static inline struct nf_conntrack_l3proto *
-__nf_ct_l3proto_find(u_int16_t l3proto)
-{
-	return nf_ct_l3protos[l3proto];
-}
-
 extern struct nf_conntrack_l3proto *
 nf_ct_l3proto_find_get(u_int16_t l3proto);
 
@@ -103,4 +97,13 @@ extern void nf_ct_l3proto_put(struct nf_
 extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;
 extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;
 extern struct nf_conntrack_l3proto nf_conntrack_generic_l3proto;
+
+static inline struct nf_conntrack_l3proto *
+__nf_ct_l3proto_find(u_int16_t l3proto)
+{
+	if (unlikely(l3proto >= AF_MAX))
+		return &nf_conntrack_generic_l3proto;
+	return nf_ct_l3protos[l3proto];
+}
+
 #endif /*_NF_CONNTRACK_L3PROTO_H*/
net/netfilter/nf_conntrack_core.c +1 -1
index 62bb509..0ce337a 100644
@@ -188,7 +188,7 @@ extern struct nf_conntrack_protocol nf_c
 struct nf_conntrack_protocol *
 __nf_ct_proto_find(u_int16_t l3proto, u_int8_t protocol)
 {
-	if (unlikely(nf_ct_protos[l3proto] == NULL))
+	if (unlikely(l3proto >= AF_MAX || nf_ct_protos[l3proto] == NULL))
 		return &nf_conntrack_generic_protocol;
 
 	return nf_ct_protos[l3proto][protocol];
#4 lore raw

PATCH 4/14 : ULOG/nfnetlink_log: Use better default value for 'nlbufsiz'

In reply to Patrick McHardy

[NETFILTER]: ULOG/nfnetlink_log: Use better default value for 'nlbufsiz'

Performance tests showed that ULOG may fail on heavy loaded systems because of failed order-N allocations (N >= 1).

The default value of 4096 is not optimal in the sense that it actually allocates _two_ contigous physical pages. Reasoning: ULOG uses alloc_skb(), which adds another ~300 bytes for skb_shared_info.

This patch sets the default value to NLMSG_GOODSIZE and adds some documentation at the top.

---
commit 5974aa1e67cc9139557471d57aa6b54c7fb6aed5
tree 4f3f1e9d8d38ab0f88549bdfd44cd51f72eb8104
parent edf3735e79f637f92f34d0848bfb6c0ea45a9349
author Holger Eitzenberger <[email protected]> Fri, 03 Feb 2006 12:36:48 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:36:48 +0100

 net/bridge/netfilter/ebt_ulog.c |    2 +-
 net/ipv4/netfilter/ipt_ULOG.c   |    6 +++++-
 net/netfilter/nfnetlink_log.c   |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
net/bridge/netfilter/ebt_ulog.c +1 -1
index ce617b3..dbbf9f6 100644
@@ -46,7 +46,7 @@
 #define PRINTR(format, args...) do { if (net_ratelimit()) \
                                 printk(format , ## args); } while (0)
 
-static unsigned int nlbufsiz = 4096;
+static unsigned int nlbufsiz = NLMSG_GOODSIZE;
 module_param(nlbufsiz, uint, 0600);
 MODULE_PARM_DESC(nlbufsiz, "netlink buffer size (number of bytes) "
                            "(defaults to 4096)");
net/ipv4/netfilter/ipt_ULOG.c +5 -1
index 641dbc4..2fe6413 100644
@@ -35,6 +35,10 @@
  * each nlgroup you are using, so the total kernel memory usage increases
  * by that factor.
  *
+ * Actually you should use nlbufsiz a bit smaller than PAGE_SIZE, since
+ * nlbufsiz is used with alloc_skb, which adds another
+ * sizeof(struct skb_shared_info).  Use NLMSG_GOODSIZE instead.
+ *
  * flushtimeout:
  *   Specify, after how many hundredths of a second the queue should be
  *   flushed even if it is not full yet.
@@ -76,7 +80,7 @@ MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NE
 
 #define PRINTR(format, args...) do { if (net_ratelimit()) printk(format , ## args); } while (0)
 
-static unsigned int nlbufsiz = 4096;
+static unsigned int nlbufsiz = NLMSG_GOODSIZE;
 module_param(nlbufsiz, uint, 0400);
 MODULE_PARM_DESC(nlbufsiz, "netlink buffer size");
 
net/netfilter/nfnetlink_log.c +1 -1
index e10512e..50787af 100644
@@ -37,7 +37,7 @@
 #include "../bridge/br_private.h"
 #endif
 
-#define NFULNL_NLBUFSIZ_DEFAULT	4096
+#define NFULNL_NLBUFSIZ_DEFAULT	NLMSG_GOODSIZE
 #define NFULNL_TIMEOUT_DEFAULT 	100	/* every second */
 #define NFULNL_QTHRESH_DEFAULT 	100	/* 100 packets */
 
#5 lore raw

PATCH 5/14 : Fix undersized skb allocation in ipt_ULOG/ebt_ulog/nfnetlink_log

In reply to Patrick McHardy

[NETFILTER]: Fix undersized skb allocation in ipt_ULOG/ebt_ulog/nfnetlink_log

The skb allocated is always of size nlbufsize, even if that is smaller than the size needed for the current packet.

---
commit c99461f9ce0d7050da0af3d9975769d65431e440
tree 5a04b78b7d8afad833e60f3884d2711b9cd76692
parent 5974aa1e67cc9139557471d57aa6b54c7fb6aed5
author Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:37:55 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:37:55 +0100

 net/bridge/netfilter/ebt_ulog.c |    8 +++++---
 net/ipv4/netfilter/ipt_ULOG.c   |   22 +++++++++++++---------
 net/netfilter/nfnetlink_log.c   |   20 ++++++++++++--------
 3 files changed, 30 insertions(+), 20 deletions(-)
net/bridge/netfilter/ebt_ulog.c +5 -3
index dbbf9f6..802baf7 100644
@@ -98,12 +98,14 @@ static void ulog_timer(unsigned long dat
 static struct sk_buff *ulog_alloc_skb(unsigned int size)
 {
 	struct sk_buff *skb;
+	unsigned int n;
 
-	skb = alloc_skb(nlbufsiz, GFP_ATOMIC);
+	n = max(size, nlbufsiz);
+	skb = alloc_skb(n, GFP_ATOMIC);
 	if (!skb) {
 		PRINTR(KERN_ERR "ebt_ulog: can't alloc whole buffer "
-		       "of size %ub!\n", nlbufsiz);
-		if (size < nlbufsiz) {
+		       "of size %ub!\n", n);
+		if (n > size) {
 			/* try to allocate only as much as we need for
 			 * current packet */
 			skb = alloc_skb(size, GFP_ATOMIC);
net/ipv4/netfilter/ipt_ULOG.c +13 -9
index 2fe6413..180a9ea 100644
@@ -147,22 +147,26 @@ static void ulog_timer(unsigned long dat
 static struct sk_buff *ulog_alloc_skb(unsigned int size)
 {
 	struct sk_buff *skb;
+	unsigned int n;
 
 	/* alloc skb which should be big enough for a whole
 	 * multipart message. WARNING: has to be <= 131000
 	 * due to slab allocator restrictions */
 
-	skb = alloc_skb(nlbufsiz, GFP_ATOMIC);
+	n = max(size, nlbufsiz);
+	skb = alloc_skb(n, GFP_ATOMIC);
 	if (!skb) {
-		PRINTR("ipt_ULOG: can't alloc whole buffer %ub!\n",
-			nlbufsiz);
+		PRINTR("ipt_ULOG: can't alloc whole buffer %ub!\n", n);
 
-		/* try to allocate only as much as we need for 
-		 * current packet */
-
-		skb = alloc_skb(size, GFP_ATOMIC);
-		if (!skb)
-			PRINTR("ipt_ULOG: can't even allocate %ub\n", size);
+		if (n > size) {
+			/* try to allocate only as much as we need for 
+			 * current packet */
+
+			skb = alloc_skb(size, GFP_ATOMIC);
+			if (!skb)
+				PRINTR("ipt_ULOG: can't even allocate %ub\n",
+				       size);
+		}
 	}
 
 	return skb;
net/netfilter/nfnetlink_log.c +12 -8
index 50787af..3b3c781 100644
@@ -314,24 +314,28 @@ static struct sk_buff *nfulnl_alloc_skb(
 					unsigned int pkt_size)
 {
 	struct sk_buff *skb;
+	unsigned int n;
 
 	UDEBUG("entered (%u, %u)\n", inst_size, pkt_size);
 
 	/* alloc skb which should be big enough for a whole multipart
 	 * message.  WARNING: has to be <= 128k due to slab restrictions */
 
-	skb = alloc_skb(inst_size, GFP_ATOMIC);
+	n = max(inst_size, pkt_size);
+	skb = alloc_skb(n, GFP_ATOMIC);
 	if (!skb) {
 		PRINTR("nfnetlink_log: can't alloc whole buffer (%u bytes)\n",
 			inst_size);
 
-		/* try to allocate only as much as we need for current
-		 * packet */
-
-		skb = alloc_skb(pkt_size, GFP_ATOMIC);
-		if (!skb)
-			PRINTR("nfnetlink_log: can't even alloc %u bytes\n",
-				pkt_size);
+		if (n > pkt_size) {
+			/* try to allocate only as much as we need for current
+			 * packet */
+
+			skb = alloc_skb(pkt_size, GFP_ATOMIC);
+			if (!skb)
+				PRINTR("nfnetlink_log: can't even alloc %u "
+				       "bytes\n", pkt_size);
+		}
 	}
 
 	return skb;
#6 lore raw

PATCH 6/14 : nfnetlink_queue: fix packet marking over netlink

In reply to Patrick McHardy

[NETFILTER]: nfnetlink_queue: fix packet marking over netlink

The packet marked is the netlink skb, not the queued skb.

---
commit 27a0e70cdd3fdf3988c94739ad75f6fc5d89c326
tree e74e0da1d1d65bcaafb9a5c5864b059afb688c2b
parent c99461f9ce0d7050da0af3d9975769d65431e440
author Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:38:39 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:38:39 +0100

 net/netfilter/nfnetlink_queue.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
net/netfilter/nfnetlink_queue.c +2 -1
index 18ed9c5..cac38b2 100644
@@ -825,7 +825,8 @@ nfqnl_recv_verdict(struct sock *ctnl, st
 	}
 
 	if (nfqa[NFQA_MARK-1])
-		skb->nfmark = ntohl(*(u_int32_t *)NFA_DATA(nfqa[NFQA_MARK-1]));
+		entry->skb->nfmark = ntohl(*(u_int32_t *)
+		                           NFA_DATA(nfqa[NFQA_MARK-1]));
 		
 	issue_verdict(entry, verdict);
 	instance_put(queue);
#7 lore raw

PATCH 7/14 : Fix missing src port initialization in tftp expectation mask

In reply to Patrick McHardy

[NETFILTER]: Fix missing src port initialization in tftp expectation mask

Reported by David Ahern <[email protected]>, netfilter bugzilla #426.

---
commit c84c986a5028347c036a1915a3320c51dd3be4a6
tree 702216309d0c48492f77f47ce2717671143eb876
parent 27a0e70cdd3fdf3988c94739ad75f6fc5d89c326
author Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:39:41 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:39:41 +0100

 net/ipv4/netfilter/ip_conntrack_tftp.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
net/ipv4/netfilter/ip_conntrack_tftp.c +1 -0
index d3c5a37..4ba4463 100644
@@ -71,6 +71,7 @@ static int tftp_help(struct sk_buff **ps
 
 		exp->tuple = ct->tuplehash[IP_CT_DIR_REPLY].tuple;
 		exp->mask.src.ip = 0xffffffff;
+		exp->mask.src.u.udp.port = 0;
 		exp->mask.dst.ip = 0xffffffff;
 		exp->mask.dst.u.udp.port = 0xffff;
 		exp->mask.dst.protonum = 0xff;
#8 lore raw

PATCH 8/14 : iptables: fix typos in ipt_connbytes.h

In reply to Patrick McHardy

[NETFILTER]: iptables: fix typos in ipt_connbytes.h

Fix some typos that make iptables userspace compilation fail.

---
commit 94b31e7f3e367691f07b3497b64562d31a0b2e29
tree f773e9c3fd28a51a12fdf649f9f0e3e2d8d3133d
parent c84c986a5028347c036a1915a3320c51dd3be4a6
author Yasuyuki Kozakai <[email protected]> Fri, 03 Feb 2006 12:40:46 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:40:46 +0100

 include/linux/netfilter_ipv4/ipt_connbytes.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
include/linux/netfilter_ipv4/ipt_connbytes.h +2 -2
index b04dfa3..f63e6ee 100644
@@ -1,10 +1,10 @@
 #ifndef _IPT_CONNBYTES_H
 #define _IPT_CONNBYTES_H
 
-#include <net/netfilter/xt_connbytes.h>
+#include <linux/netfilter/xt_connbytes.h>
 #define ipt_connbytes_what xt_connbytes_what
 
-#define IPT_CONNBYTES_PKTS	XT_CONNBYTES_PACKETS
+#define IPT_CONNBYTES_PKTS	XT_CONNBYTES_PKTS
 #define IPT_CONNBYTES_BYTES	XT_CONNBYTES_BYTES
 #define IPT_CONNBYTES_AVGPKT	XT_CONNBYTES_AVGPKT
 
#9 lore raw

PATCH 9/14 : nf_conntrack: fix incorrect memset() size in FTP helper

In reply to Patrick McHardy

[NETFILTER]: nf_conntrack: fix incorrect memset() size in FTP helper

This memset() is executing with a bad size. According to Yasuyuki Kozakai, this memset() can be deleted, as 'ftp' is declared in global area.

---
commit 37c30c251f15cb0a38cd4065e178f11b6ed5c145
tree b90f3490836911084280f7fbe7f77d6ebc6bdc83
parent 94b31e7f3e367691f07b3497b64562d31a0b2e29
author Samir Bellabes <[email protected]> Fri, 03 Feb 2006 12:42:07 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:42:07 +0100

 net/netfilter/nf_conntrack_ftp.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
net/netfilter/nf_conntrack_ftp.c +0 -2
index ab0c920..6f210f3 100644
@@ -657,8 +657,6 @@ static int __init init(void)
 	/* FIXME should be configurable whether IPv4 and IPv6 FTP connections
 		 are tracked or not - YK */
 	for (i = 0; i < ports_c; i++) {
-		memset(&ftp[i], 0, sizeof(struct nf_conntrack_helper));
-
 		ftp[i][0].tuple.src.l3num = PF_INET;
 		ftp[i][1].tuple.src.l3num = PF_INET6;
 		for (j = 0; j < 2; j++) {
#10 lore raw

PATCH 10/14 : Fix possible overflow in netfilters do_replace()

In reply to Patrick McHardy

[NETFILTER]: Fix possible overflow in netfilters do_replace()

netfilter's do_replace() can overflow on addition within SMP_ALIGN() and/or on multiplication by NR_CPUS, resulting in a buffer overflow on the copy_from_user(). In practice, the overflow on addition is triggerable on all systems, whereas the multiplication one might require much physical memory to be present due to the check above. Either is sufficient to overwrite arbitrary amounts of kernel memory.

I really hate adding the same check to all 4 versions of do_replace(), but the code is duplicate...

Found by Solar Designer during security audit of OpenVZ.org

---
commit 9da97b95715756a28bfc1a931f033db6206d7dfd
tree 324df1f3f32b106230846b91decb996bda9bafbb
parent 37c30c251f15cb0a38cd4065e178f11b6ed5c145
author Kirill Korotaev <[email protected]> Fri, 03 Feb 2006 12:46:15 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:46:15 +0100

 net/bridge/netfilter/ebtables.c |    7 +++++++
 net/ipv4/netfilter/arp_tables.c |    7 +++++++
 net/ipv4/netfilter/ip_tables.c  |    7 +++++++
 net/ipv6/netfilter/ip6_tables.c |    7 +++++++
 4 files changed, 28 insertions(+), 0 deletions(-)
net/bridge/netfilter/ebtables.c +7 -0
index 00729b3..cbd4020 100644
@@ -934,6 +934,13 @@ static int do_replace(void __user *user,
 		BUGPRINT("Entries_size never zero\n");
 		return -EINVAL;
 	}
+	/* overflow check */
+	if (tmp.nentries >= ((INT_MAX - sizeof(struct ebt_table_info)) / NR_CPUS -
+			SMP_CACHE_BYTES) / sizeof(struct ebt_counter))
+		return -ENOMEM;
+	if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
+		return -ENOMEM;
+
 	countersize = COUNTER_OFFSET(tmp.nentries) * 
 					(highest_possible_processor_id()+1);
 	newinfo = (struct ebt_table_info *)
net/ipv4/netfilter/arp_tables.c +7 -0
index afe3d8f..dd1048b 100644
@@ -807,6 +807,13 @@ static int do_replace(void __user *user,
 	if (len != sizeof(tmp) + tmp.size)
 		return -ENOPROTOOPT;
 
+	/* overflow check */
+	if (tmp.size >= (INT_MAX - sizeof(struct xt_table_info)) / NR_CPUS -
+			SMP_CACHE_BYTES)
+		return -ENOMEM;
+	if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
+		return -ENOMEM;
+
 	newinfo = xt_alloc_table_info(tmp.size);
 	if (!newinfo)
 		return -ENOMEM;
net/ipv4/netfilter/ip_tables.c +7 -0
index 2371b20..16f47c6 100644
@@ -921,6 +921,13 @@ do_replace(void __user *user, unsigned i
 	if (len != sizeof(tmp) + tmp.size)
 		return -ENOPROTOOPT;
 
+	/* overflow check */
+	if (tmp.size >= (INT_MAX - sizeof(struct xt_table_info)) / NR_CPUS -
+			SMP_CACHE_BYTES)
+		return -ENOMEM;
+	if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
+		return -ENOMEM;
+
 	newinfo = xt_alloc_table_info(tmp.size);
 	if (!newinfo)
 		return -ENOMEM;
net/ipv6/netfilter/ip6_tables.c +7 -0
index 847068f..74ff56c 100644
@@ -978,6 +978,13 @@ do_replace(void __user *user, unsigned i
 	if (copy_from_user(&tmp, user, sizeof(tmp)) != 0)
 		return -EFAULT;
 
+	/* overflow check */
+	if (tmp.size >= (INT_MAX - sizeof(struct xt_table_info)) / NR_CPUS -
+			SMP_CACHE_BYTES)
+		return -ENOMEM;
+	if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
+		return -ENOMEM;
+
 	newinfo = xt_alloc_table_info(tmp.size);
 	if (!newinfo)
 		return -ENOMEM;
#11 lore raw

PATCH 11/14 : Check policy length in policy match strict mode

In reply to Patrick McHardy

[NETFILTER]: Check policy length in policy match strict mode

---
commit 0140ae42a6acc87e5c63ac8367473670dcffba8e
tree 0145dfe52711bf0e7d503b3d2a2d2ac603d82ad9
parent 9da97b95715756a28bfc1a931f033db6206d7dfd
author Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:46:53 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 12:46:53 +0100

 net/ipv4/netfilter/ipt_policy.c  |    2 +-
 net/ipv6/netfilter/ip6t_policy.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
net/ipv4/netfilter/ipt_policy.c +1 -1
index 18ca825..a48949a 100644
@@ -89,7 +89,7 @@ match_policy_out(const struct sk_buff *s
 			return 0;
 	}
 
-	return strict ? 1 : 0;
+	return strict ? i == info->len : 0;
 }
 
 static int match(const struct sk_buff *skb,
net/ipv6/netfilter/ip6t_policy.c +1 -1
index afe1cc4..9f38cd0 100644
@@ -91,7 +91,7 @@ match_policy_out(const struct sk_buff *s
 			return 0;
 	}
 
-	return strict ? 1 : 0;
+	return strict ? i == info->len : 0;
 }
 
 static int match(const struct sk_buff *skb,
#12 lore raw

PATCH 12/14 : Fix ip6t_policy address matching

In reply to Patrick McHardy

[NETFILTER]: Fix ip6t_policy address matching

Fix two bugs in ip6t_policy address matching:
- misorder arguments to ip6_masked_addrcmp, mask must be the second argument
- inversion incorrectly applied to the entire expression instead of just the address comparison

---
commit 13518265c8c2fc265520844ada5dd15b10aa4653
tree d374d2abc2678f3ba4da1ab282f1f24a832a9cae
parent 0140ae42a6acc87e5c63ac8367473670dcffba8e
author Patrick McHardy <[email protected]> Fri, 03 Feb 2006 13:27:12 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 13:27:12 +0100

 net/ipv6/netfilter/ip6t_policy.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
net/ipv6/netfilter/ip6t_policy.c +3 -2
index 9f38cd0..1d0f482 100644
@@ -26,8 +26,9 @@ MODULE_LICENSE("GPL");
 static inline int
 match_xfrm_state(struct xfrm_state *x, const struct ip6t_policy_elem *e)
 {
-#define MATCH_ADDR(x,y,z)	(!e->match.x || \
-				 ((ip6_masked_addrcmp((z), &e->x, &e->y)) == 0) ^ e->invert.x)
+#define MATCH_ADDR(x,y,z)	(!e->match.x ||				 \
+				 ((!ip6_masked_addrcmp(&e->x, &e->y, z)) \
+				  ^ e->invert.x))
 #define MATCH(x,y)		(!e->match.x || ((e->x == (y)) ^ e->invert.x))
 	
 	return MATCH_ADDR(saddr, smask, (struct in6_addr *)&x->props.saddr.a6) &&
#13 lore raw

PATCH 13/14 : Prepare {ipt, ip6t}_policy match for x_tables unification

In reply to Patrick McHardy

[NETFILTER]: Prepare {ipt,ip6t}_policy match for x_tables unification

The IPv4 and IPv6 version of the policy match are identical besides address comparison and the data structure used for userspace communication. Unify the data structures to break compatiblity now (before it is released), so we can port it to x_tables in 2.6.17.

---
commit ea913eda85a9b7bf0247db91213a88b1ca2d12d8
tree c5b79a5a4a7e2a8764c2824ff7aa16d9ad6f2c20
parent 13518265c8c2fc265520844ada5dd15b10aa4653
author Patrick McHardy <[email protected]> Fri, 03 Feb 2006 13:34:25 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 13:34:25 +0100

 include/linux/netfilter_ipv4/ipt_policy.h  |   22 ++++++++++++++--------
 include/linux/netfilter_ipv6/ip6t_policy.h |   22 ++++++++++++++--------
 net/ipv4/netfilter/ipt_policy.c            |    9 ++++++---
 net/ipv6/netfilter/ip6t_policy.c           |    4 ++--
 4 files changed, 36 insertions(+), 21 deletions(-)
include/linux/netfilter_ipv4/ipt_policy.h +14 -8
index 7fd1bec..a3f6eff 100644
@@ -27,16 +27,22 @@ struct ipt_policy_spec
 			reqid:1;
 };
 
+union ipt_policy_addr
+{
+	struct in_addr	a4;
+	struct in6_addr	a6;
+};
+
 struct ipt_policy_elem
 {
-	u_int32_t	saddr;
-	u_int32_t	smask;
-	u_int32_t	daddr;
-	u_int32_t	dmask;
-	u_int32_t	spi;
-	u_int32_t	reqid;
-	u_int8_t	proto;
-	u_int8_t	mode;
+	union ipt_policy_addr	saddr;
+	union ipt_policy_addr	smask;
+	union ipt_policy_addr	daddr;
+	union ipt_policy_addr	dmask;
+	u_int32_t		spi;
+	u_int32_t		reqid;
+	u_int8_t		proto;
+	u_int8_t		mode;
 
 	struct ipt_policy_spec	match;
 	struct ipt_policy_spec	invert;
include/linux/netfilter_ipv6/ip6t_policy.h +14 -8
index 5a93afc..671bd81 100644
@@ -27,16 +27,22 @@ struct ip6t_policy_spec
 			reqid:1;
 };
 
+union ip6t_policy_addr
+{
+	struct in_addr	a4;
+	struct in6_addr	a6;
+};
+
 struct ip6t_policy_elem
 {
-	struct in6_addr	saddr;
-	struct in6_addr	smask;
-	struct in6_addr	daddr;
-	struct in6_addr	dmask;
-	u_int32_t	spi;
-	u_int32_t	reqid;
-	u_int8_t	proto;
-	u_int8_t	mode;
+	union ip6t_policy_addr	saddr;
+	union ip6t_policy_addr	smask;
+	union ip6t_policy_addr	daddr;
+	union ip6t_policy_addr	dmask;
+	u_int32_t		spi;
+	u_int32_t		reqid;
+	u_int8_t		proto;
+	u_int8_t		mode;
 
 	struct ip6t_policy_spec	match;
 	struct ip6t_policy_spec	invert;
net/ipv4/netfilter/ipt_policy.c +6 -3
index a48949a..5a7a265 100644
@@ -26,10 +26,13 @@ MODULE_LICENSE("GPL");
 static inline int
 match_xfrm_state(struct xfrm_state *x, const struct ipt_policy_elem *e)
 {
-#define MATCH(x,y)	(!e->match.x || ((e->x == (y)) ^ e->invert.x))
+#define MATCH_ADDR(x,y,z)	(!e->match.x ||				     \
+		                 ((e->x.a4.s_addr == (e->y.a4.s_addr & (z))) \
+				  ^ e->invert.x))
+#define MATCH(x,y)		(!e->match.x || ((e->x == (y)) ^ e->invert.x))
 
-	return MATCH(saddr, x->props.saddr.a4 & e->smask) &&
-	       MATCH(daddr, x->id.daddr.a4 & e->dmask) &&
+	return MATCH_ADDR(saddr, smask, x->props.saddr.a4) &&
+	       MATCH_ADDR(daddr, dmask, x->id.daddr.a4) &&
 	       MATCH(proto, x->id.proto) &&
 	       MATCH(mode, x->props.mode) &&
 	       MATCH(spi, x->id.spi) &&
net/ipv6/netfilter/ip6t_policy.c +2 -2
index 1d0f482..3d39ec9 100644
@@ -26,8 +26,8 @@ MODULE_LICENSE("GPL");
 static inline int
 match_xfrm_state(struct xfrm_state *x, const struct ip6t_policy_elem *e)
 {
-#define MATCH_ADDR(x,y,z)	(!e->match.x ||				 \
-				 ((!ip6_masked_addrcmp(&e->x, &e->y, z)) \
+#define MATCH_ADDR(x,y,z)	(!e->match.x ||				       \
+				 ((!ip6_masked_addrcmp(&e->x.a6, &e->y.a6, z)) \
 				  ^ e->invert.x))
 #define MATCH(x,y)		(!e->match.x || ((e->x == (y)) ^ e->invert.x))
 	
#14 lore raw

PATCH 14/14 : Fix check whether dst_entry needs to be released after NAT

In reply to Patrick McHardy

[NETFILTER]: Fix check whether dst_entry needs to be released after NAT

After DNAT the original dst_entry needs to be released if present so the packet doesn't skip input routing with its new address. The current check for DNAT in ip_nat_in is reversed and checks for SNAT.

---
commit 4cdd7631f09d50e293bae3c28b4b6d1d757598a2
tree 2c026934d638b4229b51c901b140bf595e31a16c
parent ea913eda85a9b7bf0247db91213a88b1ca2d12d8
author Patrick McHardy <[email protected]> Fri, 03 Feb 2006 13:35:47 +0100 committer Patrick McHardy <[email protected]> Fri, 03 Feb 2006 13:35:47 +0100

 net/ipv4/netfilter/ip_nat_standalone.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
net/ipv4/netfilter/ip_nat_standalone.c +2 -2
index ad438fb..92c5499 100644
@@ -209,8 +209,8 @@ ip_nat_in(unsigned int hooknum,
 	    && (ct = ip_conntrack_get(*pskb, &ctinfo)) != NULL) {
 		enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
 
-		if (ct->tuplehash[dir].tuple.src.ip !=
-		    ct->tuplehash[!dir].tuple.dst.ip) {
+		if (ct->tuplehash[dir].tuple.dst.ip !=
+		    ct->tuplehash[!dir].tuple.src.ip) {
 			dst_release((*pskb)->dst);
 			(*pskb)->dst = NULL;
 		}
maintainer
#15 lore raw
In reply to Patrick McHardy

From: Patrick McHardy <[email protected]>
Date: Fri, 3 Feb 2006 14:43:58 +0100 (MET)

Quoted 6 lines

following are my pending netfilter bugfixes for 2.6.16, unfortunately its quite a lot, but mostly trivial patches. There are still two open bugs from the netfilter IPsec patches, the "ip_finish_output2: No header cache and no neighbour!" bug reported by Andi Kleen and a crash in xfrm4_output_finish. I'll probably have the fixes ready sometime this weekend.

All merged, thanks a lot.

Patrick, I must say you do an excellent job submitting patches. They are always logically split up, have reasonable change log entries (not too long, not too terse), and there is never any tab or newline mangling.

Thanks again.