From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) (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 64D941C84C0 for ; Tue, 20 May 2025 22:48:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=35.89.44.33 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747781304; cv=none; b=laZoJDGCdXmyba2UEmfMYS/Dh+Gii1Zpi/3P8DX8q9kKquwyUDwDIgL/cQ+xJlgp/bPxcX6U5k+NTm1/W781bfCZQ0Yj3572ntwkma3pprJUu+jyc8hEYpl2ItVEddomzU+exAfbmD2c7cdyulSE5h9Z7QKLp5ZfU9V/gSY5Ueo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747781304; c=relaxed/simple; bh=nsBsHgVZIn7v53pEHJNwcniuElU0WFLKLfRQY/VPFR8=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=F7GkzDoKxdWkL44C9Dnd75v3s+gjaPj0a7M59nIUg61IQjbwuE1rdeFARjFN846kh5Q6G+0+MeFs8n5Bykm2VeuxHWBE62/q5CocT10S2z4cM8cszYwFl1Y9LT8B35h773+FdzpZoxeKnTf5KXxjhuLhH5cP/MpIw3NhLYdizVo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=embeddedor.com; spf=pass smtp.mailfrom=embeddedor.com; dkim=pass (2048-bit key) header.d=embeddedor.com header.i=@embeddedor.com header.b=Dg2rs5Hk; arc=none smtp.client-ip=35.89.44.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=embeddedor.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=embeddedor.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=embeddedor.com header.i=@embeddedor.com header.b="Dg2rs5Hk" Received: from eig-obgw-6009a.ext.cloudfilter.net ([10.0.30.184]) by cmsmtp with ESMTPS id HSC3uOMFSWuHKHVkyuBfuz; Tue, 20 May 2025 22:48:20 +0000 Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with ESMTPS id HVkyuc3WKSPIxHVkyuFB7K; Tue, 20 May 2025 22:48:20 +0000 X-Authority-Analysis: v=2.4 cv=MdZquY/f c=1 sm=1 tr=0 ts=682d06b4 a=1YbLdUo/zbTtOZ3uB5T3HA==:117 a=efVMuJ2jJG67FGuSm7J3ww==:17 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=7T7KSl7uo7wA:10 a=VwQbUJbxAAAA:8 a=J1Y8HTJGAAAA:8 a=1XWaLZrsAAAA:8 a=20KFwNOVAAAA:8 a=Ikd4Dj_1AAAA:8 a=vggBfdFIAAAA:8 a=DJTdb95cQ3q3fOx0NTQA:9 a=QEXdDO2ut3YA:10 a=y1Q9-5lHfBjTkpIzbSAN:22 a=xYX6OU9JNrHFPr8prv8u:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=embeddedor.com; s=default; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=sQ1KdJsLeNFUGVUFftkX6bJiPEcnX1VunVFKPkYeT8w=; b=Dg2rs5HkQrM8cFMSQZir7ibl2U r5MJYf81XgVpvLxj8m1pVUZqk7lCt9GSHaLZ+INTR9ZihlXQyi/EyPjA+pr7zZntKW9rFIYCIgl8p QZ5bwrUY4I/bUQucRupRcXHboiCC0OfM2oSzAnrloBmVLy549XLcLJn52gOSknTpemZ0RcHiDWQC9 QPpsw6cqmuToNqJPYEMq+208VDKgI8A74qVKhdtfKdKfqTBpXsIDx4w4b0ZjolrLLQW8Jc51rCOU7 mBY3St5V168Y9AXi88vYgRCgkRj9Nmds/3rAH+lSb1HOP6PZNz5EgPnrzK3/kAbyM3roxKpc/3DVK Kfr8N0Fw==; Received: from [177.238.17.151] (port=48738 helo=[192.168.0.27]) by gator4166.hostgator.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.98.1) (envelope-from ) id 1uHVku-000000011s1-0VVi; Tue, 20 May 2025 17:48:16 -0500 Message-ID: Date: Tue, 20 May 2025 16:47:33 -0600 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/7] net: core: Switch netif_set_mac_address() to struct sockaddr_storage To: Kees Cook , Kuniyuki Iwashima Cc: "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 References: <20250520222452.work.063-kees@kernel.org> <20250520223108.2672023-2-kees@kernel.org> Content-Language: en-US From: "Gustavo A. R. Silva" In-Reply-To: <20250520223108.2672023-2-kees@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 177.238.17.151 X-Source-L: No X-Exim-ID: 1uHVku-000000011s1-0VVi X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: ([192.168.0.27]) [177.238.17.151]:48738 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 42 X-Org: HG=hgshared;ORG=hostgator; X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfI5H2JzIOZQb6+uB8sUD3yo399z0LqkuOLSykRa24OBv7n1qcyCURC4+Sr3VEL1KQvShWAOWOGh/Oea5ftUJluwI8HCsfW+aUw3NZ4nFR2Ig6weD0CZd XTIJ1hcu7zGrVLPWkU2RA/0pyqFIp6xk4LCxT51rJz/Z8d2+ysL0yFy9W+Nv91ClHXk6W07+tyLblBnJpC45KHxsy/NUr95OIcI= On 20/05/25 16:31, Kees Cook wrote: > 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 Acked-by: Gustavo A. R. Silva Thanks! -Gustavo > --- > 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);