lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 100/251] gre/sit: Dont generate link-local addr if addr_gen_mode is IN6_ADDR_GEN_MODE_NONE
    Date
    From: Stephen Suryaputra <ssuryaextr@gmail.com>

    [ Upstream commit 61e18ce7348bfefb5688a8bcd4b4d6b37c0f9b2a ]

    When addr_gen_mode is set to IN6_ADDR_GEN_MODE_NONE, the link-local addr
    should not be generated. But it isn't the case for GRE (as well as GRE6)
    and SIT tunnels. Make it so that tunnels consider the addr_gen_mode,
    especially for IN6_ADDR_GEN_MODE_NONE.

    Do this in add_v4_addrs() to cover both GRE and SIT only if the addr
    scope is link.

    Signed-off-by: Stephen Suryaputra <ssuryaextr@gmail.com>
    Acked-by: Antonio Quartulli <a@unstable.cc>
    Link: https://lore.kernel.org/r/20211020200618.467342-1-ssuryaextr@gmail.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/ipv6/addrconf.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
    index e47d5047d5373..178a3b26f9d2c 100644
    --- a/net/ipv6/addrconf.c
    +++ b/net/ipv6/addrconf.c
    @@ -2996,6 +2996,9 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
    memcpy(&addr.s6_addr32[3], idev->dev->dev_addr, 4);

    if (idev->dev->flags&IFF_POINTOPOINT) {
    + if (idev->cnf.addr_gen_mode == IN6_ADDR_GEN_MODE_NONE)
    + return;
    +
    addr.s6_addr32[0] = htonl(0xfe800000);
    scope = IFA_LINK;
    plen = 64;
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-24 13:40    [W:4.044 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site