Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: ipt_rpfilter: remove the nh_scope test in rpfilter_lookup_reverse

--accept-local option works for res.type == RTN_LOCAL, which should be
from the local table, but there, the fib_info's nh->nh_scope =
RT_SCOPE_NOWHERE ( > RT_SCOPE_HOST). in fib_create_info().

if (cfg->fc_scope == RT_SCOPE_HOST) {
struct fib_nh *nh = fi->fib_nh;

/* Local address is added. */
if (nhs != 1 || nh->nh_gw)
goto err_inval;
nh->nh_scope = RT_SCOPE_NOWHERE; <===
nh->nh_dev = dev_get_by_index(net, fi->fib_nh->nh_oif);
err = -ENODEV;
if (!nh->nh_dev)
goto failure;

but in our rpfilter_lookup_reverse():

if (dev_match || flags & XT_RPFILTER_LOOSE)
return FIB_RES_NH(res).nh_scope <= RT_SCOPE_HOST;

if nh->nh_scope > RT_SCOPE_HOST, it will fail. --accept-local option
will never be passed.

it seems the test is bogus and can be removed to fix this issue.

if (dev_match || flags & XT_RPFILTER_LOOSE)
return FIB_RES_NH(res).nh_scope <= RT_SCOPE_HOST;

ipv6 does not have this issue.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

lucien and committed by
Pablo Neira Ayuso
cc4998fe 6ece90f9

+1 -3
+1 -3
net/ipv4/netfilter/ipt_rpfilter.c
··· 61 61 if (FIB_RES_DEV(res) == dev) 62 62 dev_match = true; 63 63 #endif 64 - if (dev_match || flags & XT_RPFILTER_LOOSE) 65 - return FIB_RES_NH(res).nh_scope <= RT_SCOPE_HOST; 66 - return dev_match; 64 + return dev_match || flags & XT_RPFILTER_LOOSE; 67 65 } 68 66 69 67 static bool rpfilter_is_local(const struct sk_buff *skb)