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

Commit ce388f45 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: move reroute indirection to struct nf_ipv6_ops 



We cannot make a direct call to nf_ip6_reroute() because that would result
in autoloading the 'ipv6' module because of symbol dependencies.
Therefore, define reroute indirection in nf_ipv6_ops where this really
belongs to.

For IPv4, we can indeed make a direct function call, which is faster,
given IPv4 is built-in in the networking code by default. Still,
CONFIG_INET=n and CONFIG_NETFILTER=y is possible, so define empty inline
stub for IPv4 in such case.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 3f87c08c

include/linux/netfilter.h

+1 −2
Original line number Diff line number Diff line
@@ -311,8 +311,6 @@ struct nf_queue_entry; 


struct nf_afinfo {

	unsigned short	family;

	int		(*reroute)(struct net *net, struct sk_buff *skb,

				   const struct nf_queue_entry *entry);

	int		route_key_size;

};
@@ -331,6 +329,7 @@ __sum16 nf_checksum_partial(struct sk_buff *skb, unsigned int hook, 
			    u_int8_t protocol, unsigned short family);

int nf_route(struct net *net, struct dst_entry **dst, struct flowi *fl,

	     bool strict, unsigned short family);

int nf_reroute(struct sk_buff *skb, struct nf_queue_entry *entry);



int nf_register_afinfo(const struct nf_afinfo *afinfo);

void nf_unregister_afinfo(const struct nf_afinfo *afinfo);

include/linux/netfilter_ipv4.h

+8 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ struct ip_rt_info { 


int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned addr_type);



struct nf_queue_entry;



#ifdef CONFIG_INET

__sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,

		       unsigned int dataoff, u_int8_t protocol);
@@ -26,6 +28,7 @@ __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook, 
			       u_int8_t protocol);

int nf_ip_route(struct net *net, struct dst_entry **dst, struct flowi *fl,

		bool strict);

int nf_ip_reroute(struct sk_buff *skb, const struct nf_queue_entry *entry);

#else

static inline __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,

				     unsigned int dataoff, u_int8_t protocol)
@@ -45,6 +48,11 @@ static inline int nf_ip_route(struct net *net, struct dst_entry **dst, 
{

	return -EOPNOTSUPP;

}

static inline int nf_ip_reroute(struct sk_buff *skb,

				const struct nf_queue_entry *entry)

{

	return -EOPNOTSUPP;

}

#endif /* CONFIG_INET */



#endif /*__LINUX_IP_NETFILTER_H*/

include/linux/netfilter_ipv6.h

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ struct ip6_rt_info { 
	u_int32_t mark;

};



struct nf_queue_entry;



/*

 * Hook functions for ipv6 to allow xt_* modules to be built-in even

 * if IPv6 is a module.
@@ -35,6 +37,7 @@ struct nf_ipv6_ops { 
				    u_int8_t protocol);

	int (*route)(struct net *net, struct dst_entry **dst, struct flowi *fl,

		     bool strict);

	int (*reroute)(struct sk_buff *skb, const struct nf_queue_entry *entry);

};



#ifdef CONFIG_NETFILTER

net/bridge/netfilter/nf_tables_bridge.c

+0 −7
Original line number Diff line number Diff line
@@ -95,15 +95,8 @@ static const struct nf_chain_type filter_bridge = { 
	},

};



static int nf_br_reroute(struct net *net, struct sk_buff *skb,

			 const struct nf_queue_entry *entry)

{

	return 0;

}



static const struct nf_afinfo nf_br_afinfo = {

	.family                 = AF_BRIDGE,

	.reroute                = nf_br_reroute,

	.route_key_size         = 0,

};

net/ipv4/netfilter.c

+4 −4
Original line number Diff line number Diff line
@@ -80,8 +80,7 @@ int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_t 
}

EXPORT_SYMBOL(ip_route_me_harder);



static int nf_ip_reroute(struct net *net, struct sk_buff *skb,

			 const struct nf_queue_entry *entry)

int nf_ip_reroute(struct sk_buff *skb, const struct nf_queue_entry *entry)

{

	const struct ip_rt_info *rt_info = nf_queue_entry_reroute(entry);
@@ -92,10 +91,12 @@ static int nf_ip_reroute(struct net *net, struct sk_buff *skb, 
		      skb->mark == rt_info->mark &&

		      iph->daddr == rt_info->daddr &&

		      iph->saddr == rt_info->saddr))

			return ip_route_me_harder(net, skb, RTN_UNSPEC);

			return ip_route_me_harder(entry->state.net, skb,

						  RTN_UNSPEC);

	}

	return 0;

}

EXPORT_SYMBOL_GPL(nf_ip_reroute);



__sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,

			    unsigned int dataoff, u_int8_t protocol)
@@ -163,7 +164,6 @@ EXPORT_SYMBOL_GPL(nf_ip_route); 


static const struct nf_afinfo nf_ip_afinfo = {

	.family			= AF_INET,

	.reroute		= nf_ip_reroute,

	.route_key_size		= sizeof(struct ip_rt_info),

};