From: Anant Thazhemadam <anant.thazhemadam@gmail.com> To: unlisted-recipients:; (no To-header on input) Cc: linux-kernel-mentees@lists.linuxfoundation.org, joe@perches.com, Anant Thazhemadam <anant.thazhemadam@gmail.com>, syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com, Petko Manolov <petkan@nucleusys.com>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails Date: Sun, 4 Oct 2020 02:49:31 +0530 [thread overview] Message-ID: <20201003211931.11544-1-anant.thazhemadam@gmail.com> (raw) When get_registers() fails, in set_ethernet_addr(),the uninitialized value of node_id gets copied as the address. This can be considered as set_ethernet_addr() itself failing. The return type of set_ethernet_addr() is modified to indicate if it failed or not, and return values are appropriately checked by caller. When set_ethernet_addr() fails, a randomly generated MAC address is set as the MAC address instead. On the other hand, for the case when get_registers() does succeed, set_ethernet_addr() has been updated to use ether_addr_copy() to copy the address, instead of memcpy(). Reported-by: syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com Tested-by: syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com Acked-by: Petko Manolov <petkan@nucleusys.com> Signed-off-by: Anant Thazhemadam <anant.thazhemadam@gmail.com> --- 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 <davem@davemloft.net>) * 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 <joe@perches.com>) 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 * Added Acked-by: Petko Manolov drivers/net/usb/rtl8150.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index 733f120c852b..bbd49ebdf095 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c @@ -274,12 +274,17 @@ 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 bool set_ethernet_addr(rtl8150_t *dev) { - u8 node_id[6]; + u8 node_id[ETH_ALEN]; + int ret; - get_registers(dev, IDR, sizeof(node_id), node_id); - memcpy(dev->netdev->dev_addr, node_id, sizeof(node_id)); + ret = get_registers(dev, IDR, sizeof(node_id), node_id); + if (ret == sizeof(node_id)) { + ether_addr_copy(dev->netdev->dev_addr, node_id); + return true; + } + return false; } static int rtl8150_set_mac_address(struct net_device *netdev, void *p) @@ -909,7 +914,10 @@ static int rtl8150_probe(struct usb_interface *intf, goto out1; } fill_skb_pool(dev); - set_ethernet_addr(dev); + if (!set_ethernet_addr(dev)) { + dev_err(&intf->dev, "assigining a random MAC address\n"); + eth_hw_addr_random(dev->netdev); + } usb_set_intfdata(intf, dev); SET_NETDEV_DEV(netdev, &intf->dev); -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Anant Thazhemadam <anant.thazhemadam@gmail.com> Cc: Anant Thazhemadam <anant.thazhemadam@gmail.com>, Petko Manolov <petkan@nucleusys.com>, syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com, netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, joe@perches.com, Jakub Kicinski <kuba@kernel.org>, linux-kernel-mentees@lists.linuxfoundation.org, "David S. Miller" <davem@davemloft.net> Subject: [Linux-kernel-mentees] [PATCH v3] net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails Date: Sun, 4 Oct 2020 02:49:31 +0530 [thread overview] Message-ID: <20201003211931.11544-1-anant.thazhemadam@gmail.com> (raw) When get_registers() fails, in set_ethernet_addr(),the uninitialized value of node_id gets copied as the address. This can be considered as set_ethernet_addr() itself failing. The return type of set_ethernet_addr() is modified to indicate if it failed or not, and return values are appropriately checked by caller. When set_ethernet_addr() fails, a randomly generated MAC address is set as the MAC address instead. On the other hand, for the case when get_registers() does succeed, set_ethernet_addr() has been updated to use ether_addr_copy() to copy the address, instead of memcpy(). Reported-by: syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com Tested-by: syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com Acked-by: Petko Manolov <petkan@nucleusys.com> Signed-off-by: Anant Thazhemadam <anant.thazhemadam@gmail.com> --- 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 <davem@davemloft.net>) * 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 <joe@perches.com>) 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 * Added Acked-by: Petko Manolov drivers/net/usb/rtl8150.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index 733f120c852b..bbd49ebdf095 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c @@ -274,12 +274,17 @@ 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 bool set_ethernet_addr(rtl8150_t *dev) { - u8 node_id[6]; + u8 node_id[ETH_ALEN]; + int ret; - get_registers(dev, IDR, sizeof(node_id), node_id); - memcpy(dev->netdev->dev_addr, node_id, sizeof(node_id)); + ret = get_registers(dev, IDR, sizeof(node_id), node_id); + if (ret == sizeof(node_id)) { + ether_addr_copy(dev->netdev->dev_addr, node_id); + return true; + } + return false; } static int rtl8150_set_mac_address(struct net_device *netdev, void *p) @@ -909,7 +914,10 @@ static int rtl8150_probe(struct usb_interface *intf, goto out1; } fill_skb_pool(dev); - set_ethernet_addr(dev); + if (!set_ethernet_addr(dev)) { + dev_err(&intf->dev, "assigining a random MAC address\n"); + eth_hw_addr_random(dev->netdev); + } usb_set_intfdata(intf, dev); SET_NETDEV_DEV(netdev, &intf->dev); -- 2.25.1 _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next reply other threads:[~2020-10-03 21:20 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-03 21:19 Anant Thazhemadam [this message] 2020-10-03 21:19 ` [Linux-kernel-mentees] [PATCH v3] net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails Anant Thazhemadam 2020-10-03 21:35 ` Joe Perches 2020-10-03 21:35 ` [Linux-kernel-mentees] " Joe Perches 2020-10-03 21:45 ` Anant Thazhemadam 2020-10-03 21:45 ` [Linux-kernel-mentees] " Anant Thazhemadam
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201003211931.11544-1-anant.thazhemadam@gmail.com \ --to=anant.thazhemadam@gmail.com \ --cc=davem@davemloft.net \ --cc=joe@perches.com \ --cc=kuba@kernel.org \ --cc=linux-kernel-mentees@lists.linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=petkan@nucleusys.com \ --cc=syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.