From patchwork Tue May 20 22:31:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 891504 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2810B263C73; Tue, 20 May 2025 22:31:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747780275; cv=none; b=EqD7VM/cjS3gRSG/moJ4vKULn0o1FRI4EYByHJXv9VI3tkISJ9+ykJKrm2fEuiBFerDAfhyh5ecHoZ7fqtVYKgKiRx6JQbM7tHJ+Ywa9GSwh7K7LpdYWOQMgsaqcMWxJ0QubYrsJe7vFCFlvRMJDseMgdc4NMFsBEkX/XvQagCQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747780275; c=relaxed/simple; bh=G/KW2fG4F98OctuROMgZgIIvFCaLrHVnDk1WTYvgspw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jBmQHIi6/wMJSK7TfiLciDmuzyBA/RXx9Zyn+ebfMT7EODrJstTgUhkNt1LiLAdQF8RgJ5dZURzvdLB0NgLEntn19Yyn+1vIET8WnULMbLWeawT8DXyi2T5oAW7ftupMGLJ2dMoU0tar+03HRhy9svbLMoV5zMLIOWInXSGSklg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=f187OrFC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="f187OrFC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90BDFC4AF0C; Tue, 20 May 2025 22:31:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747780274; bh=G/KW2fG4F98OctuROMgZgIIvFCaLrHVnDk1WTYvgspw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f187OrFCg57oP0keL/hhM+Str6skqYz5KDi3ixuy4dW6InjJA8mmWQIlXSQwLQ6pB yu//5NY1YoeUx2lAW15/4R9wVmBv8p7VaNipK9g8pxMsfWkg85pxXf3TQFP/10oK/r BAsL57NAaPfN2JFfEWJV2ks4VFHiVIFMCTRKK1tx2sMMpa36JgSgRUQoMSPkTRwXF4 PPepSZwyKYp3lw02cEfA+Q04Z89y1WnubbHp/MwY1gfXDenV9S1p+totqqC03C2/rR W/JQGom8aSowEx+F8QHM9zx3JEOHmx7bNAvAEOJXQXRg4xfKGkuXseY/eEVZuv2tr/ KKnIxOBXL6Fcg== From: Kees Cook To: Kuniyuki Iwashima Cc: Kees Cook , Samuel Mendoza-Jonas , Paul Fertser , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , netdev@vger.kernel.org, Christoph Hellwig , Sagi Grimberg , Chaitanya Kulkarni , "Martin K. Petersen" , Mike Christie , Max Gurtovoy , Maurizio Lombardi , Dmitry Bogdanov , Mingzhe Zou , Christophe Leroy , "Dr. David Alan Gilbert" , Andrew Lunn , Stanislav Fomichev , Cosmin Ratiu , Lei Yang , Ido Schimmel , Alexander Aring , Stefan Schmidt , Miquel Raynal , Hayes Wang , Douglas Anderson , Grant Grundler , Jay Vosburgh , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Jiri Pirko , Eric Biggers , Milan Broz , Philipp Hahn , Ard Biesheuvel , Al Viro , Ahmed Zaki , Alexander Lobakin , Xiao Liang , linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-wpan@vger.kernel.org, linux-usb@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH 3/7] net/ncsi: Use struct sockaddr_storage for pending_mac Date: Tue, 20 May 2025 15:31:02 -0700 Message-Id: <20250520223108.2672023-3-kees@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250520222452.work.063-kees@kernel.org> References: <20250520222452.work.063-kees@kernel.org> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4361; i=kees@kernel.org; h=from:subject; bh=G/KW2fG4F98OctuROMgZgIIvFCaLrHVnDk1WTYvgspw=; b=owGbwMvMwCVmps19z/KJym7G02pJDBm6TCunCmxWFNePehP86dB70827uoPWdOgUrArcFFzwa 3ksv9jJjlIWBjEuBlkxRZYgO/c4F4+37eHucxVh5rAygQxh4OIUgIlcPMjwVzQp/92/7mUeWUz6 crLSi1crXmCVWSB2NPJaUDunXPnyRob/ZWuqXyrWdfZONDS471Garv39t+b7vVEcbcL/o4JbpUo ZAA== X-Developer-Key: i=kees@kernel.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 To avoid future casting with coming API type changes, switch struct ncsi_dev_priv::pending_mac to a full struct sockaddr_storage. Signed-off-by: Kees Cook Acked-by: Gustavo A. R. Silva --- Cc: Samuel Mendoza-Jonas Cc: Paul Fertser Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Simon Horman Cc: --- net/ncsi/internal.h | 2 +- net/ncsi/ncsi-manage.c | 2 +- net/ncsi/ncsi-rsp.c | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/net/ncsi/internal.h b/net/ncsi/internal.h index 2c260f33b55c..e76c6de0c784 100644 --- a/net/ncsi/internal.h +++ b/net/ncsi/internal.h @@ -322,7 +322,7 @@ struct ncsi_dev_priv { #define NCSI_DEV_RESHUFFLE 4 #define NCSI_DEV_RESET 8 /* Reset state of NC */ unsigned int gma_flag; /* OEM GMA flag */ - struct sockaddr pending_mac; /* MAC address received from GMA */ + struct sockaddr_storage pending_mac; /* MAC address received from GMA */ spinlock_t lock; /* Protect the NCSI device */ unsigned int package_probe_id;/* Current ID during probe */ unsigned int package_num; /* Number of packages */ diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c index b36947063783..0202db2aea3e 100644 --- a/net/ncsi/ncsi-manage.c +++ b/net/ncsi/ncsi-manage.c @@ -1058,7 +1058,7 @@ static void ncsi_configure_channel(struct ncsi_dev_priv *ndp) break; case ncsi_dev_state_config_apply_mac: rtnl_lock(); - ret = dev_set_mac_address(dev, &ndp->pending_mac, NULL); + ret = dev_set_mac_address(dev, (struct sockaddr *)&ndp->pending_mac, NULL); rtnl_unlock(); if (ret < 0) netdev_warn(dev, "NCSI: 'Writing MAC address to device failed\n"); diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c index 8668888c5a2f..472cc68ad86f 100644 --- a/net/ncsi/ncsi-rsp.c +++ b/net/ncsi/ncsi-rsp.c @@ -628,7 +628,7 @@ static int ncsi_rsp_handler_snfc(struct ncsi_request *nr) static int ncsi_rsp_handler_oem_gma(struct ncsi_request *nr, int mfr_id) { struct ncsi_dev_priv *ndp = nr->ndp; - struct sockaddr *saddr = &ndp->pending_mac; + struct sockaddr_storage *saddr = &ndp->pending_mac; struct net_device *ndev = ndp->ndev.dev; struct ncsi_rsp_oem_pkt *rsp; u32 mac_addr_off = 0; @@ -644,11 +644,11 @@ static int ncsi_rsp_handler_oem_gma(struct ncsi_request *nr, int mfr_id) else if (mfr_id == NCSI_OEM_MFR_INTEL_ID) mac_addr_off = INTEL_MAC_ADDR_OFFSET; - saddr->sa_family = ndev->type; - memcpy(saddr->sa_data, &rsp->data[mac_addr_off], ETH_ALEN); + saddr->ss_family = ndev->type; + memcpy(saddr->__data, &rsp->data[mac_addr_off], ETH_ALEN); if (mfr_id == NCSI_OEM_MFR_BCM_ID || mfr_id == NCSI_OEM_MFR_INTEL_ID) - eth_addr_inc((u8 *)saddr->sa_data); - if (!is_valid_ether_addr((const u8 *)saddr->sa_data)) + eth_addr_inc(saddr->__data); + if (!is_valid_ether_addr(saddr->__data)) return -ENXIO; /* Set the flag for GMA command which should only be called once */ @@ -1088,7 +1088,7 @@ static int ncsi_rsp_handler_netlink(struct ncsi_request *nr) static int ncsi_rsp_handler_gmcma(struct ncsi_request *nr) { struct ncsi_dev_priv *ndp = nr->ndp; - struct sockaddr *saddr = &ndp->pending_mac; + struct sockaddr_storage *saddr = &ndp->pending_mac; struct net_device *ndev = ndp->ndev.dev; struct ncsi_rsp_gmcma_pkt *rsp; int i; @@ -1105,15 +1105,15 @@ static int ncsi_rsp_handler_gmcma(struct ncsi_request *nr) rsp->addresses[i][4], rsp->addresses[i][5]); } - saddr->sa_family = ndev->type; + saddr->ss_family = ndev->type; for (i = 0; i < rsp->address_count; i++) { if (!is_valid_ether_addr(rsp->addresses[i])) { netdev_warn(ndev, "NCSI: Unable to assign %pM to device\n", rsp->addresses[i]); continue; } - memcpy(saddr->sa_data, rsp->addresses[i], ETH_ALEN); - netdev_warn(ndev, "NCSI: Will set MAC address to %pM\n", saddr->sa_data); + memcpy(saddr->__data, rsp->addresses[i], ETH_ALEN); + netdev_warn(ndev, "NCSI: Will set MAC address to %pM\n", saddr->__data); break; }