From patchwork Tue May 20 22:31:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 891484 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 3299E250C1F; Tue, 20 May 2025 22:31:11 +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=1747780272; cv=none; b=m1fEfq5N2Mq9i+FzMq5LD6Vta6cTg4YY+UJknvgQh1l8VfLQmjxiHyUuVWR8dixh96KPHFBkxvC4JdpD0Y4cxnn7BzBYtSyfkO+9bCF30IsczannuClUasVcSia/hpORQg/M0Rz+dXPZ8I6KqhJAtrGdzXzLa9shFcmSrWlgXCM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747780272; c=relaxed/simple; bh=EN+GclfyW5kAxeN8WNPlyC9ZwL/jol7JwmGHWkiT4Ho=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PiEjtujSVEPtpU1NIotATGEGsFqVbyJ0S4o5eIrgJvpe4FBEmFDxKxtP3uPrtoMa5mbv2Lj5IXiA8Ro8xF5AaKEmqNZrtPprSm7y5BRYi9kdYZhLyjN5X1vdLvPQmlC5c4P0D7VKJ/i7aLWTiLXzITEX3ecK66d9YvvWyqJfcBM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dC6GEMrR; 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="dC6GEMrR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF3B8C4AF09; Tue, 20 May 2025 22:31:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747780271; bh=EN+GclfyW5kAxeN8WNPlyC9ZwL/jol7JwmGHWkiT4Ho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dC6GEMrR2q1oaK8xsVSF2NUNGwrnfGyhc1tnZMsVWuPq9D2hKdWuafB+2noLdvhl/ gAvocEEUtyWQ5tFvpFZuyWJiaT4vyMB9WYIOnt1Ld3RqB0Ex2SeuJzcbVFo+pK4hSa LU32yQ4sIY1qEQyEiz1VwIrdK3x5rUFxioBMWZBWgzfsjDFNYJRgGWn7v7kM56mLl+ 8ydpia6nDB2EE/tpcyoB5zZEOjtCAR1ZCM/JRgZl6NZuprwOJkfgKeIuBOKDHl6sWh WQLiHQU5/NLSPgkFEdfkKOMi3rv1EiU6KDV27k/EcXyqf5fSHi9WwbM16a8wwDvgWI YoqAHtGvo6alw== From: Kees Cook To: Kuniyuki Iwashima Cc: Kees Cook , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn , Stanislav Fomichev , Cosmin Ratiu , Lei Yang , Ido Schimmel , 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" , Samuel Mendoza-Jonas , Paul Fertser , 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 2/7] net: core: Switch netif_set_mac_address() to struct sockaddr_storage Date: Tue, 20 May 2025 15:31:01 -0700 Message-Id: <20250520223108.2672023-2-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-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4301; i=kees@kernel.org; h=from:subject; bh=EN+GclfyW5kAxeN8WNPlyC9ZwL/jol7JwmGHWkiT4Ho=; b=owGbwMvMwCVmps19z/KJym7G02pJDBm6TCvevNzDfb14x7WnP3O6zjSt2sKgMWtn9Nnn8WWX1 1qqSLLpdZSyMIhxMciKKbIE2bnHuXi8bQ93n6sIM4eVCWQIAxenAEzkvDPDP9WOiROtppmKdDp8 +eX+/EOifeGbHY/nPtme9yj0pNmF6ZcZ/sfnXBWUOvjGsqyw8YH74+ZJH6yW2prO/cM0oSlgS8Y TZ0YA X-Developer-Key: i=kees@kernel.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 In order to avoid passing around struct sockaddr that has a size the compiler cannot reason about (nor track at runtime), convert netif_set_mac_address() to take struct sockaddr_storage. This is just a cast conversion, so there is are no binary changes. Following patches will make actual allocation changes. Signed-off-by: Kees Cook --- Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Simon Horman Cc: Andrew Lunn Cc: Stanislav Fomichev Cc: Cosmin Ratiu Cc: Lei Yang Cc: Kuniyuki Iwashima Cc: Ido Schimmel Cc: --- include/linux/netdevice.h | 2 +- net/core/dev.c | 10 +++++----- net/core/dev_api.c | 4 ++-- net/core/rtnetlink.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index ea9d335de130..47200a394a02 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -4212,7 +4212,7 @@ int netif_set_mtu(struct net_device *dev, int new_mtu); int dev_set_mtu(struct net_device *, int); int dev_pre_changeaddr_notify(struct net_device *dev, const char *addr, struct netlink_ext_ack *extack); -int netif_set_mac_address(struct net_device *dev, struct sockaddr *sa, +int netif_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss, struct netlink_ext_ack *extack); int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa, struct netlink_ext_ack *extack); diff --git a/net/core/dev.c b/net/core/dev.c index fccf2167b235..f8c8aad7df2e 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -9655,7 +9655,7 @@ int dev_pre_changeaddr_notify(struct net_device *dev, const char *addr, } EXPORT_SYMBOL(dev_pre_changeaddr_notify); -int netif_set_mac_address(struct net_device *dev, struct sockaddr *sa, +int netif_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss, struct netlink_ext_ack *extack) { const struct net_device_ops *ops = dev->netdev_ops; @@ -9663,15 +9663,15 @@ int netif_set_mac_address(struct net_device *dev, struct sockaddr *sa, if (!ops->ndo_set_mac_address) return -EOPNOTSUPP; - if (sa->sa_family != dev->type) + if (ss->ss_family != dev->type) return -EINVAL; if (!netif_device_present(dev)) return -ENODEV; - err = dev_pre_changeaddr_notify(dev, sa->sa_data, extack); + err = dev_pre_changeaddr_notify(dev, ss->__data, extack); if (err) return err; - if (memcmp(dev->dev_addr, sa->sa_data, dev->addr_len)) { - err = ops->ndo_set_mac_address(dev, sa); + if (memcmp(dev->dev_addr, ss->__data, dev->addr_len)) { + err = ops->ndo_set_mac_address(dev, ss); if (err) return err; } diff --git a/net/core/dev_api.c b/net/core/dev_api.c index f9a160ab596f..b5f293e637d9 100644 --- a/net/core/dev_api.c +++ b/net/core/dev_api.c @@ -91,7 +91,7 @@ int dev_set_mac_address_user(struct net_device *dev, struct sockaddr *sa, down_write(&dev_addr_sem); netdev_lock_ops(dev); - ret = netif_set_mac_address(dev, sa, extack); + ret = netif_set_mac_address(dev, (struct sockaddr_storage *)sa, extack); netdev_unlock_ops(dev); up_write(&dev_addr_sem); @@ -332,7 +332,7 @@ int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa, int ret; netdev_lock_ops(dev); - ret = netif_set_mac_address(dev, sa, extack); + ret = netif_set_mac_address(dev, (struct sockaddr_storage *)sa, extack); netdev_unlock_ops(dev); return ret; diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 8a914b37ef6e..9743f1c2ae3c 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3100,7 +3100,7 @@ static int do_setlink(const struct sk_buff *skb, struct net_device *dev, memcpy(sa->sa_data, nla_data(tb[IFLA_ADDRESS]), dev->addr_len); - err = netif_set_mac_address(dev, sa, extack); + err = netif_set_mac_address(dev, (struct sockaddr_storage *)sa, extack); kfree(sa); if (err) { up_write(&dev_addr_sem); 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: 891483 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-scsi@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 --- 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; } From patchwork Tue May 20 22:31:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 891482 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 32F79263F4E; Tue, 20 May 2025 22:31:15 +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=F59hLFlMZ02qfj6qZ1eixkQdoL7Gk5nv4cefHk6JP/bM/2dHoiD7s3WP9ftlC+XNtn5tbd9tvNdg1uUjLMmTYKw3rMwo/N15i7SQouohK9NjC6sZOpnmmMLr1HE3IE6cRp8Pt9DhLCtl4qreqLfqfGJ5YfTNzQeTdzJxA8GwK78= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747780275; c=relaxed/simple; bh=igIPzWO4UtdlqVXqgaOEG8EKTrUUS9nBOd3frgkk2rw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e/8zc0RI5oHkTxpmFURNh0bDtHjCr40LiYK5v+zDDmnpfsIDc76IMTbPMdFIcaWRbZWPHe2vu2WGZnpWLdivKOWiLCT1c/5cZeWahngYo2dhIDQItGxquxLus0Bjf+NEr0CLurudvgD88x4iEsJKbqbrRGv9A8R8JyNN+FQZxtE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bsxpPlJ3; 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="bsxpPlJ3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D095C4CEED; 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=igIPzWO4UtdlqVXqgaOEG8EKTrUUS9nBOd3frgkk2rw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bsxpPlJ30B2iPit5zxKLslFZoOWGdQyDGeqAyQ/8P30IGpTUrYAxr42VZtu8kZUbE rUtRN/GmQBGaFvzdzDyZHshdYSJ6Rzkfa7dvxQFwq+RRFKlV5ht1lxUb6chN5A8IrI /Gudl7bGdcNWQaHYApSbJVwe7EsTLHtiK6VnxB3OiJR1EO2jI426TJ0nbDsB2LU17n YwhxHS8fRR1lcMihZAngxorPiWNA+TNvtKq7cwZg7Y5E5EdCqxEa5WeCFidaEVoyTy 9z45u3z4mYW5DTDiv6hR3Gz+eJBItlcRnDq7eyC/FLEdhjcEqvzA1+rps8rkXAWyQR fSCmw93wwVCjw== From: Kees Cook To: Kuniyuki Iwashima Cc: Kees Cook , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Hayes Wang , Douglas Anderson , Grant Grundler , linux-usb@vger.kernel.org, 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 , Simon Horman , "Dr. David Alan Gilbert" , Stanislav Fomichev , Cosmin Ratiu , Lei Yang , Ido Schimmel , Samuel Mendoza-Jonas , Paul Fertser , Alexander Aring , Stefan Schmidt , Miquel Raynal , 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-hyperv@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH 5/7] net: usb: r8152: Convert to use struct sockaddr_storage internally Date: Tue, 20 May 2025 15:31:04 -0700 Message-Id: <20250520223108.2672023-5-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-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5694; i=kees@kernel.org; h=from:subject; bh=igIPzWO4UtdlqVXqgaOEG8EKTrUUS9nBOd3frgkk2rw=; b=owGbwMvMwCVmps19z/KJym7G02pJDBm6TCvrcy63S9y8Erpym7rgmW8P2lLcVmgumKje5tVVe P7yEZVNHaUsDGJcDLJiiixBdu5xLh5v28Pd5yrCzGFlAhnCwMUpABOpuc3IcDp6R0Jtx14WFefS rXVdmut2deade3BX7OIJnXiRDilNe4Z/KnedHzN4RPn1JBT6yLfPU75/ic1R6GXT++fdMXuY9hR yAAA= X-Developer-Key: i=kees@kernel.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 To support coming API type changes, switch to sockaddr_storage usage internally. Signed-off-by: Kees Cook --- Cc: Andrew Lunn Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Hayes Wang Cc: Douglas Anderson Cc: Grant Grundler Cc: Cc: --- drivers/net/usb/r8152.c | 52 +++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 67f5d30ffcba..b18dee1b1bb3 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -1665,14 +1665,14 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u32 speed, u8 duplex, u32 advertising); -static int __rtl8152_set_mac_address(struct net_device *netdev, void *p, +static int __rtl8152_set_mac_address(struct net_device *netdev, + struct sockaddr_storage *addr, bool in_resume) { struct r8152 *tp = netdev_priv(netdev); - struct sockaddr *addr = p; int ret = -EADDRNOTAVAIL; - if (!is_valid_ether_addr(addr->sa_data)) + if (!is_valid_ether_addr(addr->__data)) goto out1; if (!in_resume) { @@ -1683,10 +1683,10 @@ static int __rtl8152_set_mac_address(struct net_device *netdev, void *p, mutex_lock(&tp->control); - eth_hw_addr_set(netdev, addr->sa_data); + eth_hw_addr_set(netdev, addr->__data); ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); - pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data); + pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->__data); ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); mutex_unlock(&tp->control); @@ -1706,7 +1706,8 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p) * host system provided MAC address. * Examples of this are Dell TB15 and Dell WD15 docks */ -static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa) +static int vendor_mac_passthru_addr_read(struct r8152 *tp, + struct sockaddr_storage *ss) { acpi_status status; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; @@ -1774,47 +1775,48 @@ static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa) ret = -EINVAL; goto amacout; } - memcpy(sa->sa_data, buf, 6); + memcpy(ss->__data, buf, 6); tp->netdev->addr_assign_type = NET_ADDR_STOLEN; netif_info(tp, probe, tp->netdev, - "Using pass-thru MAC addr %pM\n", sa->sa_data); + "Using pass-thru MAC addr %pM\n", ss->__data); amacout: kfree(obj); return ret; } -static int determine_ethernet_addr(struct r8152 *tp, struct sockaddr *sa) +static int determine_ethernet_addr(struct r8152 *tp, + struct sockaddr_storage *ss) { struct net_device *dev = tp->netdev; int ret; - sa->sa_family = dev->type; + ss->ss_family = dev->type; - ret = eth_platform_get_mac_address(&tp->udev->dev, sa->sa_data); + ret = eth_platform_get_mac_address(&tp->udev->dev, ss->__data); if (ret < 0) { if (tp->version == RTL_VER_01) { - ret = pla_ocp_read(tp, PLA_IDR, 8, sa->sa_data); + ret = pla_ocp_read(tp, PLA_IDR, 8, ss->__data); } else { /* if device doesn't support MAC pass through this will * be expected to be non-zero */ - ret = vendor_mac_passthru_addr_read(tp, sa); + ret = vendor_mac_passthru_addr_read(tp, ss); if (ret < 0) ret = pla_ocp_read(tp, PLA_BACKUP, 8, - sa->sa_data); + ss->__data); } } if (ret < 0) { netif_err(tp, probe, dev, "Get ether addr fail\n"); - } else if (!is_valid_ether_addr(sa->sa_data)) { + } else if (!is_valid_ether_addr(ss->__data)) { netif_err(tp, probe, dev, "Invalid ether addr %pM\n", - sa->sa_data); + ss->__data); eth_hw_addr_random(dev); - ether_addr_copy(sa->sa_data, dev->dev_addr); + ether_addr_copy(ss->__data, dev->dev_addr); netif_info(tp, probe, dev, "Random ether addr %pM\n", - sa->sa_data); + ss->__data); return 0; } @@ -1824,17 +1826,17 @@ static int determine_ethernet_addr(struct r8152 *tp, struct sockaddr *sa) static int set_ethernet_addr(struct r8152 *tp, bool in_resume) { struct net_device *dev = tp->netdev; - struct sockaddr sa; + struct sockaddr_storage ss; int ret; - ret = determine_ethernet_addr(tp, &sa); + ret = determine_ethernet_addr(tp, &ss); if (ret < 0) return ret; if (tp->version == RTL_VER_01) - eth_hw_addr_set(dev, sa.sa_data); + eth_hw_addr_set(dev, ss.__data); else - ret = __rtl8152_set_mac_address(dev, &sa, in_resume); + ret = __rtl8152_set_mac_address(dev, &ss, in_resume); return ret; } @@ -8421,7 +8423,7 @@ static int rtl8152_post_reset(struct usb_interface *intf) { struct r8152 *tp = usb_get_intfdata(intf); struct net_device *netdev; - struct sockaddr sa; + struct sockaddr_storage ss; if (!tp || !test_bit(PROBED_WITH_NO_ERRORS, &tp->flags)) goto exit; @@ -8429,8 +8431,8 @@ static int rtl8152_post_reset(struct usb_interface *intf) rtl_set_accessible(tp); /* reset the MAC address in case of policy change */ - if (determine_ethernet_addr(tp, &sa) >= 0) - dev_set_mac_address (tp->netdev, &sa, NULL); + if (determine_ethernet_addr(tp, &ss) >= 0) + dev_set_mac_address(tp->netdev, (struct sockaddr *)&ss, NULL); netdev = tp->netdev; if (!netif_running(netdev)) From patchwork Tue May 20 22:31:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 891481 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 6CCF626462C; Tue, 20 May 2025 22:31:15 +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=rrPGJnaMH75ovdAYyr6Th35iEsKMcUfc5reKPyDLVEZgt5H9VHljPBMxmgNxfcLv8zvUOYIcyxZXfHdGl6MYeac4zI2Dfwk+ndMG5knyu5g3/2TK8Af39wwvqB0DjCUo/vhWa8l+DY6XCiNH86hMrpn+BdFwF8fiovENRKVCSU4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747780275; c=relaxed/simple; bh=7Qa/IpuQKFOWRWF79NofDyxxIjQyXX1yFfRlJmNAhpQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FMGvzHCkuxWqFl+EdeIaiVXvWM22bM1XJy5kvTmjTryNWpe/9siMWQcQEU50HrVch5PMu2DM+GQA+KKftY3EDepBiQj5wCiiItWSzMh+Y8ue1eE+W9Hwp2K/UcdljULWD1lI4QK0DMDxxJSvDq4XpdM2Y4rcvM1R+v9WBnlsinA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BOwFhMEv; 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="BOwFhMEv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8CF8AC4CEF2; 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=7Qa/IpuQKFOWRWF79NofDyxxIjQyXX1yFfRlJmNAhpQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BOwFhMEvnncEbt04sunuSxfflgKvjcUp7JSXl1Rx49NjhAjlJs3CnmgFEO2OjYLFS FnxMRf+Y0l8NIw9qbw2FBVhJEmGUfzmI3o5rYjb5Xats4x1tM2hRAQqRSZlsxW/PVs 99R5M0bnHfVohXHQoaW/qQCm7BPLAGEzVl0pXcL5Vst2Vc6khbh8bQjuyOktICMffX U3L1qVyImNx2jT/9p34tb3ykRcqoI2oa5OpAV4Lpy5hLXCv+0K7HtW4O6s6vPI/P8i l2MNooYeY9cP5g1ou6cmJiHAiz4cPxZ+ZQeRqLYZPnvcGd3eMSvAungNxE2YUbqYgG 83Ywtr100ZzXw== From: Kees Cook To: Kuniyuki Iwashima Cc: Kees Cook , Eric Dumazet , Jakub Kicinski , "David S. Miller" , Paolo Abeni , Simon Horman , Ido Schimmel , 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 , Samuel Mendoza-Jonas , Paul Fertser , 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 7/7] rtnetlink: do_setlink: Use struct sockaddr_storage Date: Tue, 20 May 2025 15:31:06 -0700 Message-Id: <20250520223108.2672023-7-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-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2093; i=kees@kernel.org; h=from:subject; bh=7Qa/IpuQKFOWRWF79NofDyxxIjQyXX1yFfRlJmNAhpQ=; b=owGbwMvMwCVmps19z/KJym7G02pJDBm6TKtmnOlUkkri/PtTpKuJWcgyguPHyic/Ci2ju8tye j+JT8rrKGVhEONikBVTZAmyc49z8XjbHu4+VxFmDisTyBAGLk4BmIiyHcP/5OXSpk/zfC1KOKbI rnhQbaXzKEa72P+m2Oa4bIZV4bfXMzKsmyNVf+e5ovVutyS7NQKZupb5O/XKFvdZxT2fsS5DZR0 TAA== X-Developer-Key: i=kees@kernel.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Instead of a heap allocating a variably sized struct sockaddr and lying about the type in the call to netif_set_mac_address(), use a stack allocated struct sockaddr_storage. This lets us drop the cast and avoid the allocation. Putting "ss" on the stack means it will get a reused stack slot since it is the same size (128B) as other existing single-scope stack variables, like the vfinfo array (128B), so no additional stack space is used by this function. Signed-off-by: Kees Cook --- Cc: Kuniyuki Iwashima Cc: Eric Dumazet Cc: Jakub Kicinski Cc: "David S. Miller" Cc: Paolo Abeni Cc: Simon Horman Cc: Ido Schimmel Cc: --- net/core/rtnetlink.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 9743f1c2ae3c..f9a35bdc58ad 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3080,17 +3080,7 @@ static int do_setlink(const struct sk_buff *skb, struct net_device *dev, } if (tb[IFLA_ADDRESS]) { - struct sockaddr *sa; - int len; - - len = sizeof(sa_family_t) + max_t(size_t, dev->addr_len, - sizeof(*sa)); - sa = kmalloc(len, GFP_KERNEL); - if (!sa) { - err = -ENOMEM; - goto errout; - } - sa->sa_family = dev->type; + struct sockaddr_storage ss = { }; netdev_unlock_ops(dev); @@ -3098,10 +3088,9 @@ static int do_setlink(const struct sk_buff *skb, struct net_device *dev, down_write(&dev_addr_sem); netdev_lock_ops(dev); - memcpy(sa->sa_data, nla_data(tb[IFLA_ADDRESS]), - dev->addr_len); - err = netif_set_mac_address(dev, (struct sockaddr_storage *)sa, extack); - kfree(sa); + ss.ss_family = dev->type; + memcpy(ss.__data, nla_data(tb[IFLA_ADDRESS]), dev->addr_len); + err = netif_set_mac_address(dev, &ss, extack); if (err) { up_write(&dev_addr_sem); goto errout;