From patchwork Mon Aug 24 14:47:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mira Ressel X-Patchwork-Id: 1350432 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aixah.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=aixah.de header.i=@aixah.de header.a=rsa-sha256 header.s=MBO0001 header.b=CDlOMZpF; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BZw3X5Nq3z9sRK for ; Tue, 25 Aug 2020 00:48:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726670AbgHXOsS (ORCPT ); Mon, 24 Aug 2020 10:48:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725906AbgHXOsR (ORCPT ); Mon, 24 Aug 2020 10:48:17 -0400 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [IPv6:2001:67c:2050::465:202]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1D09C061573; Mon, 24 Aug 2020 07:48:16 -0700 (PDT) Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4BZw3J3FGBzQlFd; Mon, 24 Aug 2020 16:48:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aixah.de; s=MBO0001; t=1598280490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fkhd792qXanXZZ0T3bLwPCM0WFIBZuaDtJyXb3YHYPU=; b=CDlOMZpFWNq2ShPX4xQLmG8Y3xNdoG+ioOp9PxMqiXV3o88OidTyi+f/BTUc4/ksx798/x PNgUhNiii//SENwwnEfrb2IOhsU3AS/mFeIKdzIuBu7bwDVWj7+Q3/Y332cylmGZwRcTcc gX8NS1l/SmttZc/aXun3rl4gxc9pcFjcNZPlQb8n56b6/MNc3pKnfQwhuobU/6IV04LiJi KgQWFRAG0rplRzhckUu/ir0BGW8es3c+j2dR+0nfs174fxMknAegnpZDBAzklLNZM65dfF LLVleFl/QoaGsNdRVo4VeErnMh+OTI8Osw+0Ox/ATKBPlwOcOzLgEMjRL3uTyA== Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id CGbXwHlVLfDj; Mon, 24 Aug 2020 16:48:09 +0200 (CEST) From: Mira Ressel To: "David S. Miller" , Jakub Kicinski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mira Ressel Subject: [PATCH 2/2] vlan: Initialize dev->perm_addr Date: Mon, 24 Aug 2020 14:47:47 +0000 Message-Id: <20200824144747.7037-1-aranea@aixah.de> In-Reply-To: <20200824143828.5964-1-aranea@aixah.de> References: <20200824143828.5964-1-aranea@aixah.de> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -4.43 / 15.00 / 15.00 X-Rspamd-Queue-Id: 4016A1796 X-Rspamd-UID: ae5221 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Set the perm_addr of vlan devices to that of their parent device. Otherwise, it remains all zero, with the consequence that ipv6_generate_stable_address() (which is used if the sysctl net.ipv6.conf.DEV.addr_gen_mode is set to 2 or 3) assigns every vlan interface on a host the same link-local address. This has the added benefit of giving vlan devices the same link-local address as their parent device, which is common practice, and indeed precisely what happens automatically if the default eui64-based address generation is used. Signed-off-by: Mira Ressel --- net/8021q/vlan_netlink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c index 0db85aeb119b..8c60d92b7717 100644 --- a/net/8021q/vlan_netlink.c +++ b/net/8021q/vlan_netlink.c @@ -182,6 +182,8 @@ static int vlan_newlink(struct net *src_net, struct net_device *dev, else if (dev->mtu > max_mtu) return -EINVAL; + memcpy(dev->perm_addr, real_dev->perm_addr, real_dev->addr_len); + err = vlan_changelink(dev, tb, data, extack); if (!err) err = register_vlan_dev(dev, extack);