[v4] net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails

Commit Message

Anant Thazhemadam Oct. 5, 2020, 1:29 p.m. UTC

When get_registers() fails in set_ethernet_addr(),the uninitialized
value of node_id gets copied over as the address.
So, check the return value of get_registers().

If get_registers() executed successfully (i.e., it returns
sizeof(node_id)), copy over the MAC address using ether_addr_copy()
(instead of using memcpy()).

Else, if get_registers() failed instead, a randomly generated MAC
address is set as the MAC address instead.

Reported-by: [e-mail]
Tested-by: [e-mail]
Acked-by: Petko Manolov <[e-mail]>
Signed-off-by: Anant Thazhemadam <[e-mail]>
---
Changes in v4:
	* Use netdev_notice() instead of dev_warn() and update the 
	  logged message to show the new random MAC as well 
	  (Suggested by Joe Perches <[e-mail]>)
	* Convert set_ethernet_addr()'s return type back to void.
	  Since we're not treating get_registers() (and thus 
	  set_ethernet_addr()) failing as an erroneous condition,
	  we can perform the error handling (setting a random
	  ethernet address) that was being done in v3 within 
	  set_ethernet_addr() itself.
	  (Suggested by Petko Manolov <[e-mail]>)

Changes in v3:
	* Set a random MAC address to the device rather than making
	  the device not work at all in the even set_ethernet_addr()
	  fails. (Suggested by David Miller <[e-mail]>)
	* Update set_ethernet_addr() to use ether_addr_copy() to copy 
	  the MAC Address (instead of using memcpy() for that same).
	  (Suggested by Joe Perches <[e-mail]>)


Changes in v2:
	* Modified condition checking get_registers()'s return value to 
		ret == sizeof(node_id)
	  for stricter checking in compliance with the new 
	  usb_control_msg_recv() API 
	  (Suggested by Petko Manolov <[e-mail]>)
	* Added Acked-by: Petko Manolov

 drivers/net/usb/rtl8150.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Comments

David Miller Oct. 6, 2020, 1:10 p.m. UTC | #1

From: Anant Thazhemadam <[e-mail]>
Date: Mon,  5 Oct 2020 18:59:58 +0530

> When get_registers() fails in set_ethernet_addr(),the uninitialized
> value of node_id gets copied over as the address.
> So, check the return value of get_registers().
> 
> If get_registers() executed successfully (i.e., it returns
> sizeof(node_id)), copy over the MAC address using ether_addr_copy()
> (instead of using memcpy()).
> 
> Else, if get_registers() failed instead, a randomly generated MAC
> address is set as the MAC address instead.
> 
> Reported-by: [e-mail]
> Tested-by: [e-mail]
> Acked-by: Petko Manolov <[e-mail]>
> Signed-off-by: Anant Thazhemadam <[e-mail]>

Applied, thank you.

Patch

diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 733f120c852b..9d079dc2a535 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -274,12 +274,20 @@  static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)
 		return 1;
 }
 
-static inline void set_ethernet_addr(rtl8150_t * dev)
+static void set_ethernet_addr(rtl8150_t *dev)
 {
-	u8 node_id[6];
+	u8 node_id[ETH_ALEN];
+	int ret;
+
+	ret = get_registers(dev, IDR, sizeof(node_id), node_id);
 
-	get_registers(dev, IDR, sizeof(node_id), node_id);
-	memcpy(dev->netdev->dev_addr, node_id, sizeof(node_id));
+	if (ret == sizeof(node_id)) {
+		ether_addr_copy(dev->netdev->dev_addr, node_id);
+	} else {
+		eth_hw_addr_random(dev->netdev);
+		netdev_notice(dev->netdev, "Assigned a random MAC address: %pM\n",
+			      dev->netdev->dev_addr);
+	}
 }
 
 static int rtl8150_set_mac_address(struct net_device *netdev, void *p)