Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d70e0b3 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

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: default avatarOliver Neukum <oneukum@suse.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Link: https://patch.msgid.link/20240829175201.670718-1-oneukum@suse.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f3c54d6e

drivers/net/usb/usbnet.c

+3 −8
Original line number Diff line number Diff line
@@ -67,9 +67,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);
@@ -1714,7 +1711,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.
@@ -1788,9 +1784,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);
@@ -2200,7 +2196,6 @@ static int __init usbnet_init(void) 
	BUILD_BUG_ON(

		FIELD_SIZEOF(struct sk_buff, cb) < sizeof(struct skb_data));



	eth_random_addr(node_id);

	return 0;

}

module_init(usbnet_init);