Patch "netfilter: ipt_rpfilter: remove the nh_scope test in rpfilter_lookup_reverse" has been added to the 3.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
netfilter: ipt_rpfilter: remove the nh_scope test in rpfilter_lookup_reverse
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
netfilter-ipt_rpfilter-remove-the-nh_scope-test-in-rpfilter_lookup_reverse.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
cc4998febd567d1c671684abce5595344bd4e8b2Mon Sep 17 00:00:00 2001
From: lucien <[email protected]>
Date: Tue, 6 Oct 2015 21:03:07 +0800
Subject: netfilter: ipt_rpfilter: remove the nh_scope test in rpfilter_lookup_reverse
From: lucien <[email protected]>
commit cc4998febd567d1c671684abce5595344bd4e8b2 upstream.
--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.
--- net/ipv4/netfilter/ipt_rpfilter.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/ipv4/netfilter/ipt_rpfilter.c +1 -3
@@ -61,9 +61,7 @@ static bool rpfilter_lookup_reverse(struif (FIB_RES_DEV (res) == dev) dev_match = true;#endif -if (dev_match || flags &XT_RPFILTER_LOOSE ) -return FIB_RES_NH (res).nh_scope <=RT_SCOPE_HOST ; -return dev_match; +return dev_match || flags &XT_RPFILTER_LOOSE ; }static bool rpfilter_is_local (const struct sk_buff *skb)
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/netfilter-ipt_rpfilter-remove-the-nh_scope-test-in-rpfilter_lookup_reverse.patch