lkml.org 
[lkml]   [2022]   [Jul]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 06/98] ipv6: take care of disable_policy when restoring routes
    Date
    From: Nicolas Dichtel <nicolas.dichtel@6wind.com>

    commit 3b0dc529f56b5f2328244130683210be98f16f7f upstream.

    When routes corresponding to addresses are restored by
    fixup_permanent_addr(), the dst_nopolicy parameter was not set.
    The typical use case is a user that configures an address on a down
    interface and then put this interface up.

    Let's take care of this flag in addrconf_f6i_alloc(), so that every callers
    benefit ont it.

    CC: stable@kernel.org
    CC: David Forster <dforster@brocade.com>
    Fixes: df789fe75206 ("ipv6: Provide ipv6 version of "disable_policy" sysctl")
    Reported-by: Siwar Zitouni <siwar.zitouni@6wind.com>
    Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
    Reviewed-by: David Ahern <dsahern@kernel.org>
    Link: https://lore.kernel.org/r/20220623120015.32640-1-nicolas.dichtel@6wind.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv6/addrconf.c | 4 ----
    net/ipv6/route.c | 9 ++++++++-
    2 files changed, 8 insertions(+), 5 deletions(-)

    --- a/net/ipv6/addrconf.c
    +++ b/net/ipv6/addrconf.c
    @@ -1111,10 +1111,6 @@ ipv6_add_addr(struct inet6_dev *idev, st
    goto out;
    }

    - if (net->ipv6.devconf_all->disable_policy ||
    - idev->cnf.disable_policy)
    - f6i->dst_nopolicy = true;
    -
    neigh_parms_data_state_setall(idev->nd_parms);

    ifa->addr = *cfg->pfx;
    --- a/net/ipv6/route.c
    +++ b/net/ipv6/route.c
    @@ -4590,8 +4590,15 @@ struct fib6_info *addrconf_f6i_alloc(str
    }

    f6i = ip6_route_info_create(&cfg, gfp_flags, NULL);
    - if (!IS_ERR(f6i))
    + if (!IS_ERR(f6i)) {
    f6i->dst_nocount = true;
    +
    + if (!anycast &&
    + (net->ipv6.devconf_all->disable_policy ||
    + idev->cnf.disable_policy))
    + f6i->dst_nopolicy = true;
    + }
    +
    return f6i;
    }


    \
     
     \ /
      Last update: 2022-07-05 14:25    [W:4.545 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site