From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 7699E2E7373; Sun, 7 Jun 2026 10:13:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780827187; cv=none; b=athsAGAkbp+i0cWDQtqUBzhn/UyAjc0VhHAoNApvOru+3KkdbgfV7zKaH6e/rs4nZKZSci80xnA2jfL990TXsgj6tYOvbeeF5P3CWzDJooY2GeCSmdFnIVyTlMcts5P9D04FU44UX+HqDXyhRt9SMOv43h/yM9X4NXv8qYTDanE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780827187; c=relaxed/simple; bh=1WNqWwe8Zhm+srRLKBXAYkf+oLLHb29Ai8k6coTwLYs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bifraAIxqn0gi95Gl4sCSm+DBy3ypQbC7QtaXILtaiCbcuNq2KTTA+M8tYS7WTCmL94ZI4qaqEW73uE9kApFxBk45ZneVcD/KL59Os72Oj0/spQRV7Srhlq8Ku1ro4ki8Hws1sMTSj4nGueCdU8nX/jyzy/mpRzB9BAudsam7oU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AGNf9qmK; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="AGNf9qmK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA0881F00893; Sun, 7 Jun 2026 10:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780827186; bh=2ox2xva//VEhuN5Chr9Un2MJbKxqutJ+9741A3Msh8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AGNf9qmKQ3KwVecLfMKQQ8kNnEvstQUsTOStm4Tjy3bTT/Oet7lyF0wL0VVAEru4G G1M+3xxWIE8MFvjJl55Wp1CaUYBjl+8dRBB3JyQoK3aISX2VWjQHmuuW48CuhSRHRJ 5mAcJJgylhcMoTfSuipDH315MlSUlNZRW5ptmzBI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Maxime Chevallier , Jakub Kicinski , Sasha Levin Subject: [PATCH 7.0 070/332] ethtool: linkstate: fix unbalanced ethnl_ops_complete() on PHY lookup error Date: Sun, 7 Jun 2026 11:57:19 +0200 Message-ID: <20260607095730.708243684@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260607095728.031258202@linuxfoundation.org> References: <20260607095728.031258202@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 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jakub Kicinski [ Upstream commit 596c51ed9e125b12c4d85b4530dfd4c7847634b7 ] linkstate_prepare_data() calls ethnl_req_get_phydev() before ethnl_ops_begin(), but routes its error path through "goto out" which calls ethnl_ops_complete(). Fixes: fe55b1d401c6 ("ethtool: linkstate: migrate linkstate functions to support multi-PHY setups") Reviewed-by: Maxime Chevallier Link: https://patch.msgid.link/20260526153533.2779187-4-kuba@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ethtool/linkstate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/ethtool/linkstate.c b/net/ethtool/linkstate.c index 05a5f72c99fab1..3dc52a39d34525 100644 --- a/net/ethtool/linkstate.c +++ b/net/ethtool/linkstate.c @@ -105,10 +105,8 @@ static int linkstate_prepare_data(const struct ethnl_req_info *req_base, phydev = ethnl_req_get_phydev(req_base, tb, ETHTOOL_A_LINKSTATE_HEADER, info->extack); - if (IS_ERR(phydev)) { - ret = PTR_ERR(phydev); - goto out; - } + if (IS_ERR(phydev)) + return PTR_ERR(phydev); ret = ethnl_ops_begin(dev); if (ret < 0) -- 2.53.0