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 29561C43457 for ; Mon, 12 Oct 2020 19:04:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DF39E21BE5 for ; Mon, 12 Oct 2020 19:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602529482; bh=tJXpiqg0m/RTQ/eW/y1zJ4ZsTpNUT4Lww9zHNf8olqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GbryVDm/Vp9qr83ZXwx1LGOeYlE8bVP/CkqHY4xHx5meBPoVJhbXb8tSzl0+0BZJx vLFV+cvOzQ8JPSnZiJSKufPRCZpISmpNm1swRWre+POA4j8Sv1E6q9TS37fWJk+wo+ 80QGi4xP2X2tVX4iZhpXCn1nakOEy6GEhXoJL7WE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731044AbgJLTEm (ORCPT ); Mon, 12 Oct 2020 15:04:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:54380 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391361AbgJLTE0 (ORCPT ); Mon, 12 Oct 2020 15:04:26 -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 7AAEC22266; Mon, 12 Oct 2020 19:04:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602529465; bh=tJXpiqg0m/RTQ/eW/y1zJ4ZsTpNUT4Lww9zHNf8olqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fv814XFA0ETn2NMFY9PkW9kSk9H+cBnZ79Iz5jfGaSMIO5Br8hMhaklTA/XSBifpN UsdxcwabaSfEaVd0GUfrK7tJHlbhqgWys8gXZqt1KBPQQ73uVlmXb9jISslf2SIofG YE+E5KywXd+kKZ6sEF/zW4uhDbjuYdLOxE1RRR3g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Petko Manolov , "David S . Miller" , Sasha Levin , linux-usb@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 5/6] net: usb: pegasus: Proper error handing when setting pegasus' MAC address Date: Mon, 12 Oct 2020 15:04:17 -0400 Message-Id: <20201012190418.3279866-5-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201012190418.3279866-1-sashal@kernel.org> References: <20201012190418.3279866-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-kernel@vger.kernel.org From: Petko Manolov [ Upstream commit f30e25a9d1b25ac8d40071c4dc2679ad0fcdc55a ] v2: If reading the MAC address from eeprom fail don't throw an error, use randomly generated MAC instead. Either way the adapter will soldier on and the return type of set_ethernet_addr() can be reverted to void. v1: Fix a bug in set_ethernet_addr() which does not take into account possible errors (or partial reads) returned by its helpers. This can potentially lead to writing random data into device's MAC address registers. Signed-off-by: Petko Manolov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/pegasus.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 4f505eb4f422c..f17a6852c2106 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c @@ -362,28 +362,47 @@ fail: } #endif /* PEGASUS_WRITE_EEPROM */ -static inline void get_node_id(pegasus_t *pegasus, __u8 *id) +static inline int get_node_id(pegasus_t *pegasus, u8 *id) { - int i; - __u16 w16; + int i, ret; + u16 w16; for (i = 0; i < 3; i++) { - read_eprom_word(pegasus, i, &w16); + ret = read_eprom_word(pegasus, i, &w16); + if (ret < 0) + return ret; ((__le16 *) id)[i] = cpu_to_le16(w16); } + + return 0; } static void set_ethernet_addr(pegasus_t *pegasus) { - __u8 node_id[6]; + int ret; + u8 node_id[6]; if (pegasus->features & PEGASUS_II) { - get_registers(pegasus, 0x10, sizeof(node_id), node_id); + ret = get_registers(pegasus, 0x10, sizeof(node_id), node_id); + if (ret < 0) + goto err; } else { - get_node_id(pegasus, node_id); - set_registers(pegasus, EthID, sizeof(node_id), node_id); + ret = get_node_id(pegasus, node_id); + if (ret < 0) + goto err; + ret = set_registers(pegasus, EthID, sizeof(node_id), node_id); + if (ret < 0) + goto err; } + memcpy(pegasus->net->dev_addr, node_id, sizeof(node_id)); + + return; +err: + eth_hw_addr_random(pegasus->net); + dev_info(&pegasus->intf->dev, "software assigned MAC address.\n"); + + return; } static inline int reset_mac(pegasus_t *pegasus) -- 2.25.1