Home » Mailing list archives » linux-netdev » 2009 » March » 26

Re: [patch 1/1] ctnetlink: compute generic part of event more acurately

Previous thread: [patch 2/3] netfilter: add generic function to get len of generic policy by Holger Eitzenberger on Wednesday, March 25, 2009 - 1:34 pm. (2 messages)

Next thread: [patch 0/1] ctnetlink: allocation improvements by Holger Eitzenberger on Wednesday, March 25, 2009 - 2:25 pm. (1 message)
[view original message]
From: Holger Eitzenberger
Subject: [patch 1/1] ctnetlink: compute generic part of event more acurately
Date: Wednesday, March 25, 2009 - 2:25 pm

On a box with most of the optional Netfilter switches turned off some
of the NLAs are never send, e. g. secmark, mark or the conntrack
byte/packet counters.  As a worst case scenario this may possibly
still lead to ctnetlink skbs being reallocated in netlink_trim()
later, loosing all the nice effects from the previous patches.

I try to solve that (at least partly) by correctly #ifdef'ing the
NLAs in the computation.

Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>

Index: nf-next-2.6/net/netfilter/nf_conntrack_netlink.c
===================================================================
--- nf-next-2.6.orig/net/netfilter/nf_conntrack_netlink.c
+++ nf-next-2.6/net/netfilter/nf_conntrack_netlink.c
@@ -440,19 +440,28 @@ ctnetlink_alloc_skb(const struct nf_conn
 		+ 3 * NLA_TYPE_SIZE(u_int8_t)	/* CTA_PROTO_NUM */
 		+ NLA_TYPE_SIZE(u_int32_t)	/* CTA_ID */
 		+ NLA_TYPE_SIZE(u_int32_t)	/* CTA_STATUS */
+#ifdef CONFIG_NF_CT_ACCT
 		+ 2 * nla_total_size(0)		/* CTA_COUNTERS_ORIG|REPL */
 		+ 2 * NLA_TYPE_SIZE(uint64_t)	/* CTA_COUNTERS_PACKETS */
 		+ 2 * NLA_TYPE_SIZE(uint64_t)	/* CTA_COUNTERS_BYTES */
+#endif
 		+ NLA_TYPE_SIZE(u_int32_t)	/* CTA_TIMEOUT */
 		+ nla_total_size(0)		/* CTA_PROTOINFO */
 		+ nla_total_size(0)		/* CTA_HELP */
 		+ nla_total_size(NF_CT_HELPER_NAME_LEN)	/* CTA_HELP_NAME */
+#ifdef CONFIG_NF_CONNTRACK_SECMARK
 		+ NLA_TYPE_SIZE(u_int32_t)	/* CTA_SECMARK */
+#endif
+#ifdef CONFIG_NF_NAT_NEEDED
 		+ 2 * nla_total_size(0)		/* CTA_NAT_SEQ_ADJ_ORIG|REPL */
 		+ 2 * NLA_TYPE_SIZE(u_int32_t)	/* CTA_NAT_SEQ_CORRECTION_POS */
 		+ 2 * NLA_TYPE_SIZE(u_int32_t)	/* CTA_NAT_SEQ_CORRECTION_BEFORE */
 		+ 2 * NLA_TYPE_SIZE(u_int32_t)	/* CTA_NAT_SEQ_CORRECTION_AFTER */
-		+ NLA_TYPE_SIZE(u_int32_t);	/* CTA_MARK */
+#endif
+#ifdef CONFIG_NF_CONNTRACK_MARK
+		+ NLA_TYPE_SIZE(u_int32_t)	/* CTA_MARK */
+#endif
+		;
 
 #undef NLA_TYPE_SIZE
 

-- 
--


[ message continues ]
[view original message]
From: Patrick McHardy
Subject: Re: [patch 1/1] ctnetlink: compute generic part of event more acurately
Date: Thursday, March 26, 2009 - 5:38 am

Applied, thanks Holger.
--


[ message continues ]
Previous thread: [patch 2/3] netfilter: add generic function to get len of generic policy by Holger Eitzenberger on Wednesday, March 25, 2009 - 1:34 pm. (2 messages)

Next thread: [patch 0/1] ctnetlink: allocation improvements by Holger Eitzenberger on Wednesday, March 25, 2009 - 2:25 pm. (1 message)