From 3d9d9a77cdbe2a772763f1a4da68871ffe1550f8 Mon Sep 17 00:00:00 2001

From: Stephen Suryaputra <ssuryaextr@gmail.com>

Date: Wed, 20 Oct 2021 16:06:18 -0400

Subject: [PATCH] gre/sit: Don't generate link-local addr if addr_gen_mode is IN6_ADDR_GEN_MODE_NONE

Git-commit: 61e18ce7348bfefb5688a8bcd4b4d6b37c0f9b2a

Patch-mainline: v5.16-rc1

References: stable-5.14.19

[ 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>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 net/ipv6/addrconf.c | 3 +++

 1 file changed, 3 insertions(+)

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c

index 3bf685fe64b9..eb745213561c 100644

--- a/net/ipv6/addrconf.c

+++ b/net/ipv6/addrconf.c

@@ -3100,6 +3100,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.26.2