From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A03EC10F29 for ; Tue, 17 Mar 2020 11:09:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC890206EC for ; Tue, 17 Mar 2020 11:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443371; bh=toUJospFKHCDBgdJcP24mpKKTFxNDIZmUVwYJxmwMRc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=h2IIoIbZSznUxXP5TBwDLrjgvwYhoGM+3W3lGlHIMhtU5wq5HpRr8XdJXn9mL+woe cm29tIWiMHgZzFBUm7T/POa0nm6zPa5tP3YzZLLj9wjIzwJ7NrYNvdDgv6TrQd2bXS xQkN+UG/xgDoTBPSk5a1Pd6VUhcLMr0bP3I2EXNc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728791AbgCQLJ3 (ORCPT ); Tue, 17 Mar 2020 07:09:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:51724 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728485AbgCQLJ0 (ORCPT ); Tue, 17 Mar 2020 07:09:26 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 935D420719; Tue, 17 Mar 2020 11:09:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443366; bh=toUJospFKHCDBgdJcP24mpKKTFxNDIZmUVwYJxmwMRc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yifPcVDtYPJwvtORcdFtX6A8RTJpFFEMHLhx0LHcg3gXhdS23raLDtKLAVztTNVHn pCFdJvAk3MOAWNpTglS5bmqvPE61mfQbcfFb7P4X0HdyKNd37SWslPcP+eyDkqmWGp wTcJgk0gHZ2qk4ESTYlHZrJuJVaMP54K6B2q4lrE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Bogdanov , Mark Starovoytov , Igor Russkikh , "David S. Miller" Subject: [PATCH 5.5 021/151] net: macsec: update SCI upon MAC address change. Date: Tue, 17 Mar 2020 11:53:51 +0100 Message-Id: <20200317103328.314813629@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317103326.593639086@linuxfoundation.org> References: <20200317103326.593639086@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmitry Bogdanov [ Upstream commit 6fc498bc82929ee23aa2f35a828c6178dfd3f823 ] SCI should be updated, because it contains MAC in its first 6 octets. Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver") Signed-off-by: Dmitry Bogdanov Signed-off-by: Mark Starovoytov Signed-off-by: Igor Russkikh Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/macsec.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -532,6 +532,11 @@ static struct macsec_eth_header *macsec_ return (struct macsec_eth_header *)skb_mac_header(skb); } +static sci_t dev_to_sci(struct net_device *dev, __be16 port) +{ + return make_sci(dev->dev_addr, port); +} + static u32 tx_sa_update_pn(struct macsec_tx_sa *tx_sa, struct macsec_secy *secy) { u32 pn; @@ -2903,6 +2908,7 @@ static int macsec_set_mac_address(struct out: ether_addr_copy(dev->dev_addr, addr->sa_data); + macsec->secy.sci = dev_to_sci(dev, MACSEC_PORT_ES); return 0; } @@ -3176,11 +3182,6 @@ static bool sci_exists(struct net_device return false; } -static sci_t dev_to_sci(struct net_device *dev, __be16 port) -{ - return make_sci(dev->dev_addr, port); -} - static int macsec_add_dev(struct net_device *dev, sci_t sci, u8 icv_len) { struct macsec_dev *macsec = macsec_priv(dev);