From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9EDF350A29; Tue, 21 Oct 2025 20:01:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761076878; cv=none; b=aD+i0JfZ/HSXkzQ8E+7m9sDQw+b6iwOg4CGhx24xJkP6qCb3dcC6juQfIl2gJ+RYlCONAg+bMdPZPX4InwS4qNM7rHWLbyPHfOzhgEj4j5M6WTrAqlpcS1y4Hi6dVAlbrCdgkytcY56WbfaoStVgcGSIXlT7oltkymATV0WZSHY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761076878; c=relaxed/simple; bh=vOnqNBN0yx0GX2SQVP52xm5w0jITkrm8SBbpzztAFsI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VhRb58+rfB5k5i06Y6qOhnz/D+EelhZAlO3M1kTvW1LixqStVssuwHiKCYzhsGtBXKty7bNf3iyk+U5kHaqBFbnP1sHyuojA6ABJC+Qh6FTbnSfOwbgK5TtyxjlwTk5IvqSr6O2+0yjSGLcDxFn/ywL/yEgEClxOUbHupCj5J80= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Z//i3J8s; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Z//i3J8s" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E0C5C4CEF1; Tue, 21 Oct 2025 20:01:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761076878; bh=vOnqNBN0yx0GX2SQVP52xm5w0jITkrm8SBbpzztAFsI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z//i3J8scjfL/RHCtgv3cIm66KXMHsRAwAQDQEtLgBBFn44BJY5YTWjJE6TbqIvML fLP6s5UUVTgLxwM5GNsVhKAZ5e4OCuvIzrSiRGlNUUatdzJh1H03c1YxzwsA1Lhx69 tbGbm+vMVSyTGmaedQxvOFPFPvFPE2nZonnAr26Y= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, I Viswanath , Vadim Fedorenko , Khalid Aziz , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 066/136] net: usb: lan78xx: fix use of improperly initialized dev->chipid in lan78xx_reset Date: Tue, 21 Oct 2025 21:50:54 +0200 Message-ID: <20251021195037.562091130@linuxfoundation.org> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251021195035.953989698@linuxfoundation.org> References: <20251021195035.953989698@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: I Viswanath [ Upstream commit 8d93ff40d49d70e05c82a74beae31f883fe0eaf8 ] dev->chipid is used in lan78xx_init_mac_address before it's initialized: lan78xx_reset() { lan78xx_init_mac_address() lan78xx_read_eeprom() lan78xx_read_raw_eeprom() <- dev->chipid is used here dev->chipid = ... <- dev->chipid is initialized correctly here } Reorder initialization so that dev->chipid is set before calling lan78xx_init_mac_address(). Fixes: a0db7d10b76e ("lan78xx: Add to handle mux control per chip id") Signed-off-by: I Viswanath Reviewed-by: Vadim Fedorenko Reviewed-by: Khalid Aziz Link: https://patch.msgid.link/20251013181648.35153-1-viswanathiyyappan@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/usb/lan78xx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 6babe909036cf..2da67814556f9 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2923,10 +2923,6 @@ static int lan78xx_reset(struct lan78xx_net *dev) } } while (buf & HW_CFG_LRST_); - ret = lan78xx_init_mac_address(dev); - if (ret < 0) - return ret; - /* save DEVID for later usage */ ret = lan78xx_read_reg(dev, ID_REV, &buf); if (ret < 0) @@ -2935,6 +2931,10 @@ static int lan78xx_reset(struct lan78xx_net *dev) dev->chipid = (buf & ID_REV_CHIP_ID_MASK_) >> 16; dev->chiprev = buf & ID_REV_CHIP_REV_MASK_; + ret = lan78xx_init_mac_address(dev); + if (ret < 0) + return ret; + /* Respond to the IN token with a NAK */ ret = lan78xx_read_reg(dev, USB_CFG0, &buf); if (ret < 0) -- 2.51.0