netfilter fixes for 2.6.37 (one leftover patch)
Subsystems (2)
[email protected]
maintainerPATCH 1/1 netfilter fixes for 2.6.37 (one leftover patch)
From: Pablo Neira Ayuso <[email protected]>
Hi David,
I found one leftover patch from November 22th that was applied to Patrick's tree (nf-next-2.6) but it didn't ever take its way to reach net-2.6.
Can you still pass it to Linus?
You can pull it from:
git://1984.lsi.us.es/net-2.6 master
KOVACS Krisztian (1):
netfilter: fix compilation when conntrack is disabled but tproxy is
enabled
include/linux/skbuff.h | 15 +++++++++++++++ include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 10 ---------- include/net/netfilter/ipv6/nf_defrag_ipv6.h | 10 ++++++++++ net/core/skbuff.c | 2 ++ net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 8 +++++++- 5 files changed, 34 insertions(+), 11 deletions(-)
[email protected]
maintainerPATCH 1/1 netfilter: fix compilation when conntrack is disabled but tproxy is enabled
From: KOVACS Krisztian <[email protected]>
The IPv6 tproxy patches split IPv6 defragmentation off of conntrack, but failed to update the #ifdef stanzas guarding the defragmentation related fields and code in skbuff and conntrack related code in nf_defrag_ipv6.c.
This patch adds the required #ifdefs so that IPv6 tproxy can truly be used without connection tracking.
Original report:
http://marc.info/?l=linux-netdev&m=129010118516341&w=2
--- include/linux/skbuff.h | 15 +++++++++++++++ include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 10 ---------- include/net/netfilter/ipv6/nf_defrag_ipv6.h | 10 ++++++++++ net/core/skbuff.c | 2 ++ net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 8 +++++++- 5 files changed, 34 insertions(+), 11 deletions(-)
include/linux/skbuff.h +15 -0
@@ -255,6 +255,11 @@ typedef unsigned int sk_buff_data_t;typedef unsigned char *sk_buff_data_t ;#endif +#if defined(CONFIG_NF_DEFRAG_IPV4 ) || defined(CONFIG_NF_DEFRAG_IPV4_MODULE ) || \ + defined(CONFIG_NF_DEFRAG_IPV6 ) || defined(CONFIG_NF_DEFRAG_IPV6_MODULE ) +#define NET_SKBUFF_NF_DEFRAG_NEEDED 1 +#endif +/** * struct sk_buff - socket buffer * @next: Next buffer in list
@@ -362,6 +367,8 @@ struct sk_buff {void (*destructor)(struct sk_buff *skb);#if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE )struct nf_conntrack *nfct; +#endif +#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED struct sk_buff *nfct_reasm;#endif #ifdef CONFIG_BRIDGE_NETFILTER
@@ -2057,6 +2064,8 @@ static inline void nf_conntrack_get(struct nf_conntrack *nfct)if (nfct)atomic_inc (&nfct->use); } +#endif +#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED static inline void nf_conntrack_get_reasm (struct sk_buff *skb) {if (skb)
@@ -2085,6 +2094,8 @@ static inline void nf_reset(struct sk_buff *skb)#if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE )nf_conntrack_put (skb->nfct); skb->nfct =NULL ; +#endif +#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED nf_conntrack_put_reasm (skb->nfct_reasm); skb->nfct_reasm =NULL ;#endif
@@ -2101,6 +2112,8 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src) dst->nfct = src->nfct;nf_conntrack_get (src->nfct); dst->nfctinfo = src->nfctinfo; +#endif +#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED dst->nfct_reasm = src->nfct_reasm;nf_conntrack_get_reasm (src->nfct_reasm);#endif
@@ -2114,6 +2127,8 @@ static inline void nf_copy(struct sk_buff *dst, const struct sk_buff *src) {#if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE )nf_conntrack_put (dst->nfct); +#endif +#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED nf_conntrack_put_reasm (dst->nfct_reasm);#endif #ifdef CONFIG_BRIDGE_NETFILTER
include/net/netfilter/ipv6/nf_conntrack_ipv6.h +0 -10
@@ -7,16 +7,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6; -extern int nf_ct_frag6_init (void ); -extern void nf_ct_frag6_cleanup (void ); -extern struct sk_buff *nf_ct_frag6_gather (struct sk_buff *skb,u32 user); -extern void nf_ct_frag6_output (unsigned int hooknum,struct sk_buff *skb, -struct net_device *in, -struct net_device *out, -int (*okfn)(struct sk_buff *)); - -struct inet_frags_ctl ; -#include <linux/sysctl.h> extern struct ctl_table nf_ct_ipv6_sysctl_table[];
include/net/netfilter/ipv6/nf_defrag_ipv6.h +10 -0
@@ -3,4 +3,14 @@extern void nf_defrag_ipv6_enable (void ); +extern int nf_ct_frag6_init (void ); +extern void nf_ct_frag6_cleanup (void ); +extern struct sk_buff *nf_ct_frag6_gather (struct sk_buff *skb,u32 user); +extern void nf_ct_frag6_output (unsigned int hooknum,struct sk_buff *skb, +struct net_device *in, +struct net_device *out, +int (*okfn)(struct sk_buff *)); + +struct inet_frags_ctl ; +#endif /* _NF_DEFRAG_IPV6_H */
net/core/skbuff.c +2 -0
@@ -380,6 +380,8 @@ static void skb_release_head_state(struct sk_buff *skb) }#if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE )nf_conntrack_put (skb->nfct); +#endif +#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED nf_conntrack_put_reasm (skb->nfct_reasm);#endif #ifdef CONFIG_BRIDGE_NETFILTER
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c +7 -1
@@ -19,13 +19,15 @@#include <linux/netfilter_ipv6.h> #include <linux/netfilter_bridge.h> +#if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE )#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_l4proto.h> #include <net/netfilter/nf_conntrack_l3proto.h> #include <net/netfilter/nf_conntrack_core.h> -#include <net/netfilter/nf_conntrack_zones.h> #include <net/netfilter/ipv6/nf_conntrack_ipv6.h> +#endif +#include <net/netfilter/nf_conntrack_zones.h> #include <net/netfilter/ipv6/nf_defrag_ipv6.h> static enum ip6_defrag_users nf_ct6_defrag_user(unsigned int hooknum,
@@ -33,8 +35,10 @@ static enum ip6_defrag_users nf_ct6_defrag_user(unsigned int hooknum, {u16 zone =NF_CT_DEFAULT_ZONE ; +#if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE )if (skb->nfct) zone =nf_ct_zone ((struct nf_conn *)skb->nfct); +#endif #ifdef CONFIG_BRIDGE_NETFILTER if (skb->nf_bridge &&
@@ -56,9 +60,11 @@ static unsigned int ipv6_defrag(unsigned int hooknum, {struct sk_buff *reasm; +#if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE )/* Previously seen (loopback)? */ if (skb->nfct && !nf_ct_is_template ((struct nf_conn *)skb->nfct))return NF_ACCEPT ; +#endif reasm =nf_ct_frag6_gather (skb,nf_ct6_defrag_user (hooknum, skb));/* queued */
Signature · 1 line
1.7.2.3
David Miller
maintainerFrom: [email protected]
Date: Wed, 12 Jan 2011 20:36:37 +0100
Quoted 5 lines
I found one leftover patch from November 22th that was applied to Patrick's tree (nf-next-2.6) but it didn't ever take its way to reach net-2.6.
Can you still pass it to Linus?
Of course I can.
Quoted 3 lines
You can pull it from:
git://1984.lsi.us.es/net-2.6master
Pulled, thanks Pablo.