gre/sit: Don't generate link-local addr if addr_gen_mode is IN6_ADDR_GEN_MODE_NONE
[ Upstream commit 61e18ce734
]
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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
25a45d3999
commit
9ceac307b5
@ -3097,6 +3097,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;
|
||||
|
Reference in New Issue
Block a user