Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81e839ef authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

parents bb5b7c11 258c8893

Documentation/Changes

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ o oprofile 0.9 # oprofiled --version 
o  udev                   081                     # udevinfo -V

o  grub                   0.93                    # grub --version

o  mcelog		  0.6

o  iptables               1.4.1                   # iptables -V





Kernel compilation

==================

include/net/ip.h

+1 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ enum ip_defrag_users { 
	IP_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

+8 −0
Original line number Diff line number Diff line
@@ -350,8 +350,16 @@ 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,

	IP6_DEFRAG_CONNTRACK_BRIDGE_IN,

};



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
Original line number Diff line number Diff line
@@ -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/ipv4/netfilter/nf_defrag_ipv4.c

+17 −4
Original line number Diff line number Diff line
@@ -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;