netfilter: af_info: add network namespace parameter to route hook
Subsystems (2)
Florian Westphal
maintainerPATCH v2 1/3 netfilter: af_info: add network namespace parameter to route hook
This is required to eventually replace the rt6_lookup call in xt_addrtype.c with nf_afinfo->route().
---
rebased on top of nf-2.6.git.
include/linux/netfilter.h | 3 ++- net/ipv4/netfilter.c | 5 +++-- net/ipv6/netfilter.c | 5 +++-- net/netfilter/nf_conntrack_h323_main.c | 8 ++++---- net/netfilter/xt_TCPMSS.c | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-)
include/linux/netfilter.h +2 -1
@@ -270,7 +270,8 @@ struct nf_afinfo {unsigned int dataoff, unsigned int len, u_int8_t protocol); -int (*route)(struct dst_entry **dst,struct flowi *fl); +int (*route)(struct net *net,struct dst_entry **dst, +struct flowi *fl);void (*saveroute)(const struct sk_buff *skb,struct nf_queue_entry *entry); int (*reroute)(struct sk_buff *skb,
net/ipv4/netfilter.c +3 -2
@@ -221,9 +221,10 @@ static __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook,return csum; } -static int nf_ip_route (struct dst_entry **dst,struct flowi *fl) +static int nf_ip_route (struct net *net,struct dst_entry **dst, +struct flowi *fl) { -struct rtable *rt =ip_route_output_key (&init_net, &fl->u.ip4); +struct rtable *rt =ip_route_output_key (net, &fl->u.ip4);if (IS_ERR (rt))return PTR_ERR (rt); *dst = &rt->dst;
net/ipv6/netfilter.c +3 -2
@@ -90,9 +90,10 @@ static int nf_ip6_reroute(struct sk_buff *skb,return 0 ; } -static int nf_ip6_route (struct dst_entry **dst,struct flowi *fl) +static int nf_ip6_route (struct net *net,struct dst_entry **dst, +struct flowi *fl) { - *dst =ip6_route_output (&init_net,NULL , &fl->u.ip6); + *dst =ip6_route_output (net,NULL , &fl->u.ip6);return (*dst)->error; }
net/netfilter/nf_conntrack_h323_main.c +4 -4
@@ -731,9 +731,9 @@ static int callforward_do_filter(const union nf_inet_addr *src,memset (&fl2,0 ,sizeof (fl2)); fl2.daddr = dst->ip; -if (!afinfo->route ((struct dst_entry **)&rt1, +if (!afinfo->route (&init_net, (struct dst_entry **)&rt1,flowi4_to_flowi (&fl1))) { -if (!afinfo->route ((struct dst_entry **)&rt2, +if (!afinfo->route (&init_net, (struct dst_entry **)&rt2,flowi4_to_flowi (&fl2))) {if (rt1->rt_gateway == rt2->rt_gateway && rt1->dst.dev == rt2->dst.dev)
@@ -755,9 +755,9 @@ static int callforward_do_filter(const union nf_inet_addr *src,memset (&fl2,0 ,sizeof (fl2));ipv6_addr_copy (&fl2.daddr, &dst->in6); -if (!afinfo->route ((struct dst_entry **)&rt1, +if (!afinfo->route (&init_net, (struct dst_entry **)&rt1,flowi6_to_flowi (&fl1))) { -if (!afinfo->route ((struct dst_entry **)&rt2, +if (!afinfo->route (&init_net, (struct dst_entry **)&rt2,flowi6_to_flowi (&fl2))) { if (!memcmp(&rt1->rt6i_gateway, &rt2->rt6i_gateway, sizeof(rt1->rt6i_gateway)) &&
net/netfilter/xt_TCPMSS.c +1 -1
@@ -166,7 +166,7 @@ static u_int32_t tcpmss_reverse_mtu(const struct sk_buff *skb,rcu_read_lock (); ai =nf_get_afinfo (family);if (ai !=NULL ) - ai->route ((struct dst_entry **)&rt, &fl); + ai->route (&init_net, (struct dst_entry **)&rt, &fl);rcu_read_unlock ();if (rt !=NULL ) {
Signature · 1 line
1.7.3.4
Florian Westphal
maintainerPATCH v2 2/3 netfilter: af_info: add 'strict' parameter to limit lookup to .oif
ipv6 fib lookup can set RT6_LOOKUP_F_IFACE flag to restrict search to an interface, but this flag cannot be set via struct flowi.
Also, it cannot be set via ip6_route_output: this function uses the passed sock struct to determine if this flag is required (by testing for nonzero sk_bound_dev_if).
Work around this by passing in an artificial struct sk in case 'strict' argument is true.
This is required to replace the rt6_lookup call in xt_addrtype.c with nf_afinfo->route().
---
rebased on top of nf-2.6.git.
include/linux/netfilter.h | 2 +- net/ipv4/netfilter.c | 2 +- net/ipv6/netfilter.c | 12 ++++++++++-- net/netfilter/nf_conntrack_h323_main.c | 8 ++++---- net/netfilter/xt_TCPMSS.c | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-)
include/linux/netfilter.h +1 -1
@@ -271,7 +271,7 @@ struct nf_afinfo {unsigned int len, u_int8_t protocol);int (*route)(struct net *net,struct dst_entry **dst, -struct flowi *fl); +struct flowi *fl,bool strict);void (*saveroute)(const struct sk_buff *skb,struct nf_queue_entry *entry); int (*reroute)(struct sk_buff *skb,
net/ipv4/netfilter.c +1 -1
@@ -222,7 +222,7 @@ static __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook, }static int nf_ip_route (struct net *net,struct dst_entry **dst, -struct flowi *fl) +struct flowi *fl,bool strict__always_unused ) {struct rtable *rt =ip_route_output_key (net, &fl->u.ip4);if (IS_ERR (rt))
net/ipv6/netfilter.c +10 -2
@@ -91,9 +91,17 @@ static int nf_ip6_reroute(struct sk_buff *skb, }static int nf_ip6_route (struct net *net,struct dst_entry **dst, -struct flowi *fl) +struct flowi *fl,bool strict) { - *dst =ip6_route_output (net,NULL , &fl->u.ip6); +static const struct ipv6_pinfo fake_pinfo; +static const struct inet_sock fake_sk = { +/* makes ip6_route_output set RT6_LOOKUP_F_IFACE: */ + .sk.sk_bound_dev_if =1 , + .pinet6 = (struct ipv6_pinfo *) &fake_pinfo, + }; +const void *sk = strict ? &fake_sk :NULL ; + + *dst =ip6_route_output (net, sk, &fl->u.ip6);return (*dst)->error; }
net/netfilter/nf_conntrack_h323_main.c +4 -4
@@ -732,9 +732,9 @@ static int callforward_do_filter(const union nf_inet_addr *src,memset (&fl2,0 ,sizeof (fl2)); fl2.daddr = dst->ip;if (!afinfo->route (&init_net, (struct dst_entry **)&rt1, -flowi4_to_flowi (&fl1))) { +flowi4_to_flowi (&fl1), false)) {if (!afinfo->route (&init_net, (struct dst_entry **)&rt2, -flowi4_to_flowi (&fl2))) { +flowi4_to_flowi (&fl2), false)) {if (rt1->rt_gateway == rt2->rt_gateway && rt1->dst.dev == rt2->dst.dev) ret =1 ;
@@ -756,9 +756,9 @@ static int callforward_do_filter(const union nf_inet_addr *src,memset (&fl2,0 ,sizeof (fl2));ipv6_addr_copy (&fl2.daddr, &dst->in6);if (!afinfo->route (&init_net, (struct dst_entry **)&rt1, -flowi6_to_flowi (&fl1))) { +flowi6_to_flowi (&fl1), false)) {if (!afinfo->route (&init_net, (struct dst_entry **)&rt2, -flowi6_to_flowi (&fl2))) { +flowi6_to_flowi (&fl2), false)) {if (!memcmp (&rt1->rt6i_gateway, &rt2->rt6i_gateway,sizeof (rt1->rt6i_gateway)) && rt1->dst.dev == rt2->dst.dev)
net/netfilter/xt_TCPMSS.c +1 -1
@@ -166,7 +166,7 @@ static u_int32_t tcpmss_reverse_mtu(const struct sk_buff *skb,rcu_read_lock (); ai =nf_get_afinfo (family);if (ai !=NULL ) - ai->route (&init_net, (struct dst_entry **)&rt, &fl); + ai->route (&init_net, (struct dst_entry **)&rt, &fl, false);rcu_read_unlock ();if (rt !=NULL ) {
Signature · 1 line
1.7.3.4
Re: [PATCH v2 2/3] netfilter: af_info: add 'strict' parameter to limit lookup to .oif
From: Florian Westphal <[email protected]>
Date: Thu, 24 Mar 2011 21:29:56 +0100
Quoted 7 lines
ipv6 fib lookup can set
RT6_LOOKUP_F_IFACEflag to restrict search to an interface, but this flag cannot be set via struct flowi.Also, it cannot be set via
ip6_route_output: this function uses the passed sock struct to determine if this flag is required (by testing for nonzerosk_bound_dev_if).
Quoted 7 lines
Work around this by passing in an artificial struct sk in case 'strict' argument is true.
This is required to replace the
rt6_lookupcall inxt_addrtype.cwithnf_afinfo->route().Signed-off-by Florian Westphal <[email protected]>
Patrick McHardy
AppliedRe: [PATCH v2 2/3] netfilter: af_info: add 'strict' parameter to limit lookup to .oif
Quoted 7 lines · David Miller
Quoted 7 lines
Quoted 7 lines
ipv6 fib lookup can set
RT6_LOOKUP_F_IFACEflag to restrict search to an interface, but this flag cannot be set via struct flowi.Also, it cannot be set via
ip6_route_output: this function uses the passed sock struct to determine if this flag is required (by testing for nonzerosk_bound_dev_if).
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
Work around this by passing in an artificial struct sk in case 'strict' argument is true.
This is required to replace the
rt6_lookupcall inxt_addrtype.cwithnf_afinfo->route().Signed-off-by Florian Westphal <[email protected]>Acked-by David S. Miller <[email protected]>
Applied, thanks.
Florian Westphal
maintainerPATCH v2 3/3 netfilter: xt_addrtype: replace rt6_lookup with nf_afinfo->route
In reply to Florian WestphalThis avoids pulling in the ipv6 module when using (ipv4-only) iptables -m addrtype.
---
rebased on top of nf-2.6.git.
Tested briefly with:
[0:0] -A INPUT -m addrtype --src-type LOCAL
[16:1552] -A INPUT -m addrtype --dst-type LOCAL [10:928] -A INPUT -m addrtype --dst-type LOCAL --limit-iface-in
net/netfilter/Kconfig | 1 - net/netfilter/xt_addrtype.c | 42 ++++++++++++++++++++++++++++-------------- 2 files changed, 28 insertions(+), 15 deletions(-)
net/netfilter/Kconfig +0 -1
@@ -652,7 +652,6 @@ comment "Xtables matches" config NETFILTER_XT_MATCH_ADDRTYPE tristate '"addrtype" address type match support' depends on NETFILTER_ADVANCED - depends on (IPV6 || IPV6=n) ---help--- This option allows you to match what routing thinks of an address, eg. UNICAST, LOCAL, BROADCAST, ...
net/netfilter/xt_addrtype.c +28 -14
63 lines not on this page · raw message
Signature · 1 line
1.7.3.4
Re: [PATCH v2 3/3] netfilter: xt_addrtype: replace rt6_lookup with nf_afinfo->route
From: Florian Westphal <[email protected]>
Date: Thu, 24 Mar 2011 21:29:57 +0100
Quoted 3 lines
This avoids pulling in the ipv6 module when using (ipv4-only) iptables -m addrtype.
Signed-off-by Florian Westphal <[email protected]>
Re: [PATCH v2 3/3] netfilter: xt_addrtype: replace rt6_lookup with nf_afinfo->route
Quoted 4 lines · David Miller
Quoted 3 lines
Quoted 3 lines
This avoids pulling in the ipv6 module when using (ipv4-only) iptables -m addrtype.
Signed-off-by Florian Westphal <[email protected]>Acked-by David S. Miller <[email protected]>
Also applied, thanks.
From: Florian Westphal <[email protected]>
Date: Thu, 24 Mar 2011 21:29:55 +0100
Quoted 4 lines
This is required to eventually replace the
rt6_lookupcall inxt_addrtype.cwithnf_afinfo->route().Signed-off-by Florian Westphal <[email protected]>
Patrick McHardy
AppliedQuoted 5 lines · David Miller
Quoted 4 lines
Quoted 4 lines
This is required to eventually replace the
rt6_lookupcall inxt_addrtype.cwithnf_afinfo->route().Signed-off-by Florian Westphal <[email protected]>Acked-by David S. Miller <[email protected]>
Applied, thanks.