netfilter: rpfilter: skip locally generated bcast, too
Subsystems (2)
Florian Westphal
maintainerPATCH v2 1/2 netfilter: rpfilter: skip locally generated bcast, too
Alex Efros reported rpfilter module doesn't match following packets:
IN=br.qemu SRC=192.168.2.1 DST=192.168.2.255 [ .. ] (netfilter bugzilla #814).
Problem is that network stack arranges for the locally generated broadcasts to appear on the interface they were sent out, so the IFF_LOOPBACK check doesn't trigger.
As -m rpfilter is restricted to PREROUTING, we can check for existing rtable instead, it catches locally-generated broad/multicast case, too.
---
Pablo,
I did have a look at nf_conntrack_broadcast, but
1. I cannot check skb->sk (TPROXY can set that for incoming packets)
2. I don't want to test conntrack info to avoid dependency on conntrack
So, this is pretty much the very same patch as V1, except that this also checks for _LOCAL flag instead of just checking for presence of skb_dst().
Is this ok, or did you have something else in mind?
net/ipv4/netfilter/ipt_rpfilter.c | 8 +++++++- net/ipv6/netfilter/ip6t_rpfilter.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-)
net/ipv4/netfilter/ipt_rpfilter.c +7 -1
@@ -66,6 +66,12 @@ static bool rpfilter_lookup_reverse(struct flowi4 *fl4,return dev_match; } +static bool is_local (const struct sk_buff *skb) +{ +const struct rtable *rt =skb_rtable (skb); +return rt && (rt->rt_flags &RTCF_LOCAL ); +} +static bool rpfilter_mt (const struct sk_buff *skb,struct xt_action_param *par) {const struct xt_rpfilter_info *info;
@@ -76,7 +82,7 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par) info = par->matchinfo; invert = info->flags &XT_RPFILTER_INVERT ; -if (par->in->flags &IFF_LOOPBACK ) +if (is_local (skb))return true ^ invert; iph =ip_hdr (skb);
net/ipv6/netfilter/ip6t_rpfilter.c +7 -1
@@ -71,6 +71,12 @@ static bool rpfilter_lookup_reverse6(const struct sk_buff *skb,return ret; } +static bool is_local (const struct sk_buff *skb) +{ +const struct rt6_info *rt = (const void *)skb_dst (skb); +return rt && (rt->rt6i_flags &RTF_LOCAL ); +} +static bool rpfilter_mt (const struct sk_buff *skb,struct xt_action_param *par) {const struct xt_rpfilter_info *info = par->matchinfo;
@@ -78,7 +84,7 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par)struct ipv6hdr *iph;bool invert = info->flags &XT_RPFILTER_INVERT ; -if (par->in->flags &IFF_LOOPBACK ) +if (is_local (skb))return true ^ invert; iph =ipv6_hdr (skb);
Signature · 1 line
1.7.8.6
Florian Westphal
maintainerPATCH 2/2 netfilter: rpfilter: depend on raw or mangle table
rpfilter is only valid in raw/mangle PREROUTING, i.e. RPFILTER=y|m is useless without raw or mangle table support.
--- net/ipv4/netfilter/Kconfig | 2 +- net/ipv6/netfilter/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/ipv4/netfilter/Kconfig +1 -1
@@ -71,7 +71,7 @@ config IP_NF_MATCH_ECN config IP_NF_MATCH_RPFILTER tristate '"rpfilter" reverse path filter match support' - depends on NETFILTER_ADVANCED + depends on NETFILTER_ADVANCED && (IP_NF_MANGLE || IP_NF_RAW) ---help--- This option allows you to match packets whose replies would go out via the interface the packet came in.
net/ipv6/netfilter/Kconfig +1 -1
@@ -105,7 +105,7 @@ config IP6_NF_MATCH_MH config IP6_NF_MATCH_RPFILTER tristate '"rpfilter" reverse path filter match support' - depends on NETFILTER_ADVANCED + depends on NETFILTER_ADVANCED && (IP6_NF_MANGLE || IP6_NF_RAW) ---help--- This option allows you to match packets whose replies would go out via the interface the packet came in.
Signature · 1 line
1.7.8.6
Re: [PATCH 2/2] netfilter: rpfilter: depend on raw or mangle table
Quoted 2 lines · Florian Westphal
rpfilter is only valid in raw/mangle PREROUTING, i.e. RPFILTER=y|m is useless without raw or mangle table support.
Applied to nf-next, thanks Florian.
Hi Florian,
Quoted 19 lines · Florian Westphal
Alex Efros reported rpfilter module doesn't match following packets:
IN=br.qemu SRC=192.168.2.1 DST=192.168.2.255 [ .. ] (netfilter bugzilla #814).Problem is that network stack arranges for the locally generated broadcasts to appear on the interface they were sent out, so the
IFF_LOOPBACKcheck doesn't trigger.As -m rpfilter is restricted to PREROUTING, we can check for existing rtable instead, it catches locally-generated broad/multicast case, too.
Signed-off-by Florian Westphal <[email protected]>---
Pablo,I did have a look at
nf_conntrack_broadcast, but
1. I cannot checkskb->sk(TPROXY can set that for incoming packets)
2. I don't want to test conntrack info to avoid dependency on conntrack
Quoted 5 lines
So, this is pretty much the very same patch as V1, except that this also checks for
_LOCALflag instead of just checking for presence ofskb_dst().Is this ok, or did you have something else in mind?
That's fine. I just wanted a bit further validation to avoid an easy breakage in case this assumption is not fulfilled anymore.
I have made a comestic change: renamed is_local to rpfilter_is_local just to stick to the corresponding function namespace.
Applied, thanks.