From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Kees Cook <kees@kernel.org>, Kuniyuki Iwashima <kuniyu@amazon.com>
Cc: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Hayes Wang <hayeswang@realtek.com>,
Douglas Anderson <dianders@chromium.org>,
Grant Grundler <grundler@chromium.org>,
linux-usb@vger.kernel.org, netdev@vger.kernel.org,
Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
Chaitanya Kulkarni <kch@nvidia.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Mike Christie <michael.christie@oracle.com>,
Max Gurtovoy <mgurtovoy@nvidia.com>,
Maurizio Lombardi <mlombard@redhat.com>,
Dmitry Bogdanov <d.bogdanov@yadro.com>,
Mingzhe Zou <mingzhe.zou@easystack.cn>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Simon Horman <horms@kernel.org>,
"Dr. David Alan Gilbert" <linux@treblig.org>,
Stanislav Fomichev <sdf@fomichev.me>,
Cosmin Ratiu <cratiu@nvidia.com>, Lei Yang <leiyang@redhat.com>,
Ido Schimmel <idosch@nvidia.com>,
Samuel Mendoza-Jonas <sam@mendozajonas.com>,
Paul Fertser <fercerpav@gmail.com>,
Alexander Aring <alex.aring@gmail.com>,
Stefan Schmidt <stefan@datenfreihafen.org>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Jay Vosburgh <jv@jvosburgh.net>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>,
Jiri Pirko <jiri@resnulli.us>, Eric Biggers <ebiggers@google.com>,
Milan Broz <gmazyland@gmail.com>, Philipp Hahn <phahn-oss@avm.de>,
Ard Biesheuvel <ardb@kernel.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Ahmed Zaki <ahmed.zaki@intel.com>,
Alexander Lobakin <aleksander.lobakin@intel.com>,
Xiao Liang <shaw.leon@gmail.com>,
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: Re: [PATCH 5/7] net: usb: r8152: Convert to use struct sockaddr_storage internally
Date: Tue, 20 May 2025 16:49:41 -0600 [thread overview]
Message-ID: <5e54efbb-a7e5-43e3-b30a-0fdd920de016@embeddedor.com> (raw)
In-Reply-To: <20250520223108.2672023-5-kees@kernel.org>
On 20/05/25 16:31, Kees Cook wrote:
> To support coming API type changes, switch to sockaddr_storage usage
> internally.
>
> Signed-off-by: Kees Cook <kees@kernel.org>
Acked-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks!
-Gustavo
> ---
> Cc: Andrew Lunn <andrew+netdev@lunn.ch>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Paolo Abeni <pabeni@redhat.com>
> Cc: Hayes Wang <hayeswang@realtek.com>
> Cc: Douglas Anderson <dianders@chromium.org>
> Cc: Grant Grundler <grundler@chromium.org>
> Cc: <linux-usb@vger.kernel.org>
> Cc: <netdev@vger.kernel.org>
> ---
> 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))
next prev parent reply other threads:[~2025-05-20 23:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-20 22:30 [PATCH 0/7] net: Convert dev_set_mac_address() to struct sockaddr_storage Kees Cook
2025-05-20 22:31 ` [PATCH 1/7] net: core: Convert inet_addr_is_any() to sockaddr_storage Kees Cook
2025-05-21 0:04 ` Kuniyuki Iwashima
2025-05-21 1:26 ` Martin K. Petersen
2025-05-20 22:31 ` [PATCH 2/7] net: core: Switch netif_set_mac_address() to struct sockaddr_storage Kees Cook
2025-05-20 22:47 ` Gustavo A. R. Silva
2025-05-20 22:31 ` [PATCH 3/7] net/ncsi: Use struct sockaddr_storage for pending_mac Kees Cook
2025-05-20 22:48 ` Gustavo A. R. Silva
2025-05-20 22:31 ` [PATCH 4/7] ieee802154: Use struct sockaddr_storage with dev_set_mac_address() Kees Cook
2025-05-20 22:49 ` Gustavo A. R. Silva
2025-05-20 22:31 ` [PATCH 5/7] net: usb: r8152: Convert to use struct sockaddr_storage internally Kees Cook
2025-05-20 22:49 ` Gustavo A. R. Silva [this message]
2025-05-20 22:31 ` [PATCH 6/7] net: core: Convert dev_set_mac_address() to struct sockaddr_storage Kees Cook
2025-05-20 22:50 ` Gustavo A. R. Silva
2025-05-20 22:31 ` [PATCH 7/7] rtnetlink: do_setlink: Use " Kees Cook
2025-05-20 22:50 ` Gustavo A. R. Silva
2025-05-21 0:19 ` [PATCH 0/7] net: Convert dev_set_mac_address() to " Kuniyuki Iwashima
2025-05-21 0:42 ` Kees Cook
2025-05-21 3:09 ` Jakub Kicinski
2025-05-21 5:18 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5e54efbb-a7e5-43e3-b30a-0fdd920de016@embeddedor.com \
--to=gustavo@embeddedor.com \
--cc=ahmed.zaki@intel.com \
--cc=aleksander.lobakin@intel.com \
--cc=alex.aring@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=ardb@kernel.org \
--cc=christophe.leroy@csgroup.eu \
--cc=cratiu@nvidia.com \
--cc=d.bogdanov@yadro.com \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=dianders@chromium.org \
--cc=ebiggers@google.com \
--cc=edumazet@google.com \
--cc=fercerpav@gmail.com \
--cc=gmazyland@gmail.com \
--cc=grundler@chromium.org \
--cc=haiyangz@microsoft.com \
--cc=hayeswang@realtek.com \
--cc=hch@lst.de \
--cc=horms@kernel.org \
--cc=idosch@nvidia.com \
--cc=jiri@resnulli.us \
--cc=jv@jvosburgh.net \
--cc=kch@nvidia.com \
--cc=kees@kernel.org \
--cc=kuba@kernel.org \
--cc=kuniyu@amazon.com \
--cc=kys@microsoft.com \
--cc=leiyang@redhat.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux-wpan@vger.kernel.org \
--cc=linux@treblig.org \
--cc=martin.petersen@oracle.com \
--cc=mgurtovoy@nvidia.com \
--cc=michael.christie@oracle.com \
--cc=mingzhe.zou@easystack.cn \
--cc=miquel.raynal@bootlin.com \
--cc=mlombard@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=phahn-oss@avm.de \
--cc=sagi@grimberg.me \
--cc=sam@mendozajonas.com \
--cc=sdf@fomichev.me \
--cc=shaw.leon@gmail.com \
--cc=stefan@datenfreihafen.org \
--cc=target-devel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=wei.liu@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox