From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 514FCC43457 for ; Mon, 12 Oct 2020 19:04:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 014772073A for ; Mon, 12 Oct 2020 19:04:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602529442; bh=jJ3sIofc4aSMWYjmmZP6rNmf1lYqZn8qbMxc5XwpU5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=A6zfpue9OAS4pz/g7dr4gsx0Hnz/ChZeImQPD3A10bTRgBzaTVdOstykqFg9OYmuP ud10HDP6DWn2ZV6JUkes064v2Qp7Y6XLSVe5iKr/OCfUGzOONOyBZq9e138Dcd9Nto I4EGpiWj1XtqYHk9WhxECkxfHrVnClzHbowE6DkQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390950AbgJLTDl (ORCPT ); Mon, 12 Oct 2020 15:03:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:52710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390913AbgJLTDa (ORCPT ); Mon, 12 Oct 2020 15:03:30 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9D19A22203; Mon, 12 Oct 2020 19:03:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602529409; bh=jJ3sIofc4aSMWYjmmZP6rNmf1lYqZn8qbMxc5XwpU5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uIe4+yzFlEEq6Qh+TQ9KAq+jArfrnXFn/tzexKmXrc8aVUSAxJJOkZBCF6z4UzO6C 1Ojwsy/kqiyAHkNqW6qofuKNCR3FGAWH7TvD3GtENbK26OlSbXwhpKvSb5+6HeHpOI yFfLph7YJYA/ej9SzinsYO1xPSVhcRJ/Ag/PfBGw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Anant Thazhemadam , syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com, Petko Manolov , "David S . Miller" , Sasha Levin , linux-usb@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 12/15] net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails Date: Mon, 12 Oct 2020 15:03:09 -0400 Message-Id: <20201012190313.3279397-12-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201012190313.3279397-1-sashal@kernel.org> References: <20201012190313.3279397-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Anant Thazhemadam [ Upstream commit f45a4248ea4cc13ed50618ff066849f9587226b2 ] 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: syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com Tested-by: syzbot+abbc768b560c84d92fd3@syzkaller.appspotmail.com Acked-by: Petko Manolov Signed-off-by: Anant Thazhemadam Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/rtl8150.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index 13e51ccf02147..491625c1c3084 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) -- 2.25.1