: ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery
Subsystems (4)
PATCH 1/2 : ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery
The following two patches for -stable fix some defragmentation bugs in netfilter which can cause the kernel to crash in the bridge netfilter code.
Please apply, thanks.
commit 04add9d712368c59f8736f954b1e06d3db0661ec
Author: Patrick McHardy <[email protected]> Date: Thu Dec 17 16:08:02 2009 +0100
ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery
Upstream commit 0b5ccb2:
Currently the same reassembly queue might be used for packets reassembled by conntrack in different positions in the stack (PREROUTING/LOCAL_OUT), as well as local delivery. This can cause "packet jumps" when the fragment completing a reassembled packet is queued from a different position in the stack than the previous ones.
Add a "user" identifier to the reassembly queue key to seperate the queues of each caller, similar to what we do for IPv4.
include/net/ipv6.h +7 -0
@@ -354,8 +354,15 @@ static inline int ipv6_prefix_equal(const struct in6_addr *a1,struct inet_frag_queue ; +enum ip6_defrag_users { +IP6_DEFRAG_LOCAL_DELIVER , +IP6_DEFRAG_CONNTRACK_IN , +IP6_DEFRAG_CONNTRACK_OUT , +}; +struct ip6_create_arg {__be32 id; +u32 user;struct in6_addr *src;struct in6_addr *dst; };
include/net/netfilter/ipv6/nf_conntrack_ipv6.h +1 -1
@@ -9,7 +9,7 @@ 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); +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,
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +11 -2
@@ -187,6 +187,16 @@ out:return nf_conntrack_confirm (skb); } +static enum ip6_defrag_users nf_ct6_defrag_user (unsigned int hooknum, +struct sk_buff *skb) +{ +if (hooknum ==NF_INET_PRE_ROUTING ) +return IP6_DEFRAG_CONNTRACK_IN ; +else +return IP6_DEFRAG_CONNTRACK_OUT ; + +} + static unsigned int ipv6_defrag(unsigned int hooknum, struct sk_buff *skb, const struct net_device *in,
@@ -199,8 +209,7 @@ static unsigned int ipv6_defrag(unsigned int hooknum,if (skb->nfct)return NF_ACCEPT ; - reasm =nf_ct_frag6_gather (skb); - + reasm =nf_ct_frag6_gather (skb,nf_ct6_defrag_user (hooknum, skb));/* queued */ if (reasm ==NULL )return NF_STOLEN ;
net/ipv6/netfilter/nf_conntrack_reasm.c +4 -3
@@ -170,13 +170,14 @@ out:/* Creation primitives. */ static __inline__struct nf_ct_frag6_queue * -fq_find (__be32 id,struct in6_addr *src,struct in6_addr *dst) +fq_find (__be32 id,u32 user,struct in6_addr *src,struct in6_addr *dst) {struct inet_frag_queue *q;struct ip6_create_arg arg;unsigned int hash; arg.id = id; + arg.user = user; arg.src = src; arg.dst = dst;
@@ -561,7 +562,7 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff)return 0 ; } -struct sk_buff *nf_ct_frag6_gather (struct sk_buff *skb) +struct sk_buff *nf_ct_frag6_gather (struct sk_buff *skb,u32 user) {struct sk_buff *clone;struct net_device *dev = skb->dev;
@@ -607,7 +608,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb)if (atomic_read (&nf_init_frags.mem) > nf_init_frags.high_thresh)nf_ct_frag6_evictor (); - fq =fq_find (fhdr->identification, &hdr->saddr, &hdr->daddr); + fq =fq_find (fhdr->identification, user, &hdr->saddr, &hdr->daddr);if (fq ==NULL ) {pr_debug ("Can't find and can't create new queue\n" ); goto ret_orig;
net/ipv6/reassembly.c +4 -1
@@ -72,6 +72,7 @@ struct frag_queuestruct inet_frag_queue q;__be32 id;/* fragment id */ +u32 user;struct in6_addr saddr;struct in6_addr daddr;
@@ -141,7 +142,7 @@ int ip6_frag_match(struct inet_frag_queue *q, void *a)struct ip6_create_arg *arg = a; fq = container_of(q, struct frag_queue, q); -return (fq->id == arg->id && +return (fq->id == arg->id && fq->user == arg->user &&ipv6_addr_equal (&fq->saddr, arg->src) &&ipv6_addr_equal (&fq->daddr, arg->dst)); }
@@ -163,6 +164,7 @@ void ip6_frag_init(struct inet_frag_queue *q, void *a)struct ip6_create_arg *arg = a; fq->id = arg->id; + fq->user = arg->user;ipv6_addr_copy (&fq->saddr, arg->src);ipv6_addr_copy (&fq->daddr, arg->dst); }
@@ -244,6 +246,7 @@ fq_find(struct net *net, __be32 id, struct in6_addr *src, struct in6_addr *dst,unsigned int hash; arg.id = id; + arg.user =IP6_DEFRAG_LOCAL_DELIVER ; arg.src = src; arg.dst = dst;
PATCH 2/2 : netfilter: fix crashes in bridge netfilter caused by fragment jumps
commit 182da5cb625b7e55bbf188c74861699f851feea8
Author: Patrick McHardy <[email protected]> Date: Thu Dec 17 16:08:58 2009 +0100
netfilter: fix crashes in bridge netfilter caused by fragment jumps
Upstream commit 8fa9ff68:
When fragments from bridge netfilter are passed to IPv4 or IPv6 conntrack and a reassembly queue with the same fragment key already exists from reassembling a similar packet received on a different device (f.i. with multicasted fragments), the reassembled packet might continue on a different codepath than where the head fragment originated. This can cause crashes in bridge netfilter when a fragment received on a non-bridge device (and thus with skb->nf_bridge == NULL) continues through the bridge netfilter code.
Add a new reassembly identifier for packets originating from bridge netfilter and use it to put those packets in insolated queues.
Fixes http://bugzilla.kernel.org/show_bug.cgi?id=14805
include/net/ip.h +1 -0
@@ -342,6 +342,7 @@ enum ip_defrag_usersIP_DEFRAG_CALL_RA_CHAIN ,IP_DEFRAG_CONNTRACK_IN ,IP_DEFRAG_CONNTRACK_OUT , +IP_DEFRAG_CONNTRACK_BRIDGE_IN ,IP_DEFRAG_VS_IN ,IP_DEFRAG_VS_OUT ,IP_DEFRAG_VS_FWD
include/net/ipv6.h +1 -0
@@ -358,6 +358,7 @@ enum ip6_defrag_users {IP6_DEFRAG_LOCAL_DELIVER ,IP6_DEFRAG_CONNTRACK_IN ,IP6_DEFRAG_CONNTRACK_OUT , + IP6_DEFRAG_CONNTRACK_BRIDGE_IN, }; struct ip6_create_arg {
net/ipv4/netfilter/nf_defrag_ipv4.c +17 -4
@@ -14,6 +14,7 @@#include <net/route.h> #include <net/ip.h> +#include <linux/netfilter_bridge.h> #include <linux/netfilter_ipv4.h> #include <net/netfilter/ipv4/nf_defrag_ipv4.h>
@@ -34,6 +35,20 @@ static int nf_ct_ipv4_gather_frags(struct sk_buff *skb, u_int32_t user)return err; } +static enum ip_defrag_users nf_ct_defrag_user (unsigned int hooknum, +struct sk_buff *skb) +{ +#ifdef CONFIG_BRIDGE_NETFILTER +if (skb->nf_bridge && + skb->nf_bridge->mask &BRNF_NF_BRIDGE_PREROUTING ) +return IP_DEFRAG_CONNTRACK_BRIDGE_IN ; +#endif +if (hooknum ==NF_INET_PRE_ROUTING ) +return IP_DEFRAG_CONNTRACK_IN ; +else +return IP_DEFRAG_CONNTRACK_OUT ; +} + static unsigned int ipv4_conntrack_defrag(unsigned int hooknum, struct sk_buff *skb, const struct net_device *in,
@@ -50,10 +65,8 @@ static unsigned int ipv4_conntrack_defrag(unsigned int hooknum,#endif /* Gather fragments. */ if (ip_hdr (skb)->frag_off &htons (IP_MF |IP_OFFSET )) { -if (nf_ct_ipv4_gather_frags (skb, - hooknum ==NF_INET_PRE_ROUTING ? -IP_DEFRAG_CONNTRACK_IN : -IP_DEFRAG_CONNTRACK_OUT )) +enum ip_defrag_users user =nf_ct_defrag_user (hooknum, skb); +if (nf_ct_ipv4_gather_frags (skb, user))return NF_STOLEN ; }return NF_ACCEPT ;
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +6 -0
@@ -20,6 +20,7 @@#include <net/ipv6.h> #include <net/inet_frag.h> +#include <linux/netfilter_bridge.h> #include <linux/netfilter_ipv6.h> #include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_helper.h>
@@ -190,6 +191,11 @@ out:static enum ip6_defrag_users nf_ct6_defrag_user (unsigned int hooknum,struct sk_buff *skb) { +#ifdef CONFIG_BRIDGE_NETFILTER +if (skb->nf_bridge && + skb->nf_bridge->mask &BRNF_NF_BRIDGE_PREROUTING ) +return IP6_DEFRAG_CONNTRACK_BRIDGE_IN ; +#endif if (hooknum ==NF_INET_PRE_ROUTING )return IP6_DEFRAG_CONNTRACK_IN ;else
Quoted 5 lines · Patrick McHardy
The following two patches for -stable fix some defragmentation bugs in netfilter which can cause the kernel to crash in the bridge netfilter code.
Please apply, thanks.
To which -stable tree? .32, .31, and/or .27?
thanks,
greg "tree juggler" k-h
Quoted 8 lines · Greg KH
Quoted 5 lines · Patrick McHardy
The following two patches for -stable fix some defragmentation bugs in netfilter which can cause the kernel to crash in the bridge netfilter code.
Please apply, thanks.
To which -stable tree? .32, .31, and/or .27?
The patch is based on .32, but the bug affects all versions of the kernel.
Quoted 6 lines · Patrick McHardy
Quoted 5 lines · Greg KH
Quoted 4 lines · Patrick McHardy
The following two patches for -stable fix some defragmentation bugs in netfilter which can cause the kernel to crash in the bridge netfilter code.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Please apply, thanks.
To which -stable tree? .32, .31, and/or .27?
The patch is based on .32, but the bug affects all versions of the kernel.
Thanks for letting me know, I'll queue it up for the next round of kernels.
greg k-h