usbnet: modern method to get random MAC

[ Upstream commit bab8eb0dd4cb995caa4a0529d5655531c2ec5e8e ]

The driver generates a random MAC once on load
and uses it over and over, including on two devices
needing a random MAC at the same time.

Jakub suggested revamping the driver to the modern
API for setting a random MAC rather than fixing
the old stuff.

The bug is as old as the driver.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Link: https://patch.msgid.link/20240829175201.670718-1-oneukum@suse.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index e87d3108ef054757bd3f0ee98c1f5fa911cf6abb..669cd20cfe00a4b55a72607d8e9b099fdc79af12 100644 (file)
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -64,9 +64,6 @@
 
 /*-------------------------------------------------------------------------*/
 
-// randomly generated ethernet address
-static u8      node_id [ETH_ALEN];
-
 /* use ethtool to change the level for any given device */
 static int msg_level = -1;
 module_param (msg_level, int, 0);
@@ -1696,7 +1693,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 
        dev->net = net;
        strscpy(net->name, "usb%d", sizeof(net->name));
-       eth_hw_addr_set(net, node_id);
 
        /* rx and tx sides can use different message sizes;
         * bind() should set rx_urb_size in that case.
@@ -1770,9 +1766,9 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
                goto out4;
        }
 
-       /* let userspace know we have a random address */
-       if (ether_addr_equal(net->dev_addr, node_id))
-               net->addr_assign_type = NET_ADDR_RANDOM;
+       /* this flags the device for user space */
+       if (!is_valid_ether_addr(net->dev_addr))
+               eth_hw_addr_random(net);
 
        if ((dev->driver_info->flags & FLAG_WLAN) != 0)
                SET_NETDEV_DEVTYPE(net, &wlan_type);
@@ -2182,7 +2178,6 @@ static int __init usbnet_init(void)
        BUILD_BUG_ON(
                sizeof_field(struct sk_buff, cb) < sizeof(struct skb_data));
 
-       eth_random_addr(node_id);
        return 0;
 }
 module_init(usbnet_init);