Switch to struct sockaddr_storage for calling dev_set_mac_address(). Add a temporary cast to struct sockaddr, which will be removed in a subsequent patch.
Acked-by: Gustavo A. R. Silva <gustavo...@kernel.org> Signed-off-by: Kees Cook <k...@kernel.org> --- Cc: Alexander Aring <alex.ar...@gmail.com> Cc: Stefan Schmidt <ste...@datenfreihafen.org> Cc: Miquel Raynal <miquel.ray...@bootlin.com> Cc: "David S. Miller" <da...@davemloft.net> Cc: Eric Dumazet <eduma...@google.com> Cc: Jakub Kicinski <k...@kernel.org> Cc: Paolo Abeni <pab...@redhat.com> Cc: Simon Horman <ho...@kernel.org> Cc: <linux-w...@vger.kernel.org> Cc: <net...@vger.kernel.org> --- net/ieee802154/nl-phy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c index 359249ab77bf..ee2b190e8e0d 100644 --- a/net/ieee802154/nl-phy.c +++ b/net/ieee802154/nl-phy.c @@ -224,17 +224,17 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info) dev_hold(dev); if (info->attrs[IEEE802154_ATTR_HW_ADDR]) { - struct sockaddr addr; + struct sockaddr_storage addr; - addr.sa_family = ARPHRD_IEEE802154; - nla_memcpy(&addr.sa_data, info->attrs[IEEE802154_ATTR_HW_ADDR], + addr.ss_family = ARPHRD_IEEE802154; + nla_memcpy(&addr.__data, info->attrs[IEEE802154_ATTR_HW_ADDR], IEEE802154_ADDR_LEN); /* strangely enough, some callbacks (inetdev_event) from * dev_set_mac_address require RTNL_LOCK */ rtnl_lock(); - rc = dev_set_mac_address(dev, &addr, NULL); + rc = dev_set_mac_address(dev, (struct sockaddr *)&addr, NULL); rtnl_unlock(); if (rc) goto dev_unregister; -- 2.34.1