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 505E13AF662; Mon, 23 Mar 2026 16:14:48 +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=1774282488; cv=none; b=DUw3x6eyQs9a9IBaOQGetMUZRdsZYHV0FUZRaVpRA9B/IHvp4yCg/uxJvqEMJOgIpnRsO3y3F65q7OuYocyBwJ+bAkgSX6HSe4uRNGvaCNSvlYOtIMDk6eLedJBuwS3ylVFqjweUT3zUyjL1vVvpPe+sBAc4LPZ+syyoEDaoqrI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774282488; c=relaxed/simple; bh=S1fNEXoZG28aBjGUWm4TotGufZxaqaB8CJkQvQhW22I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MA6criHHsBgpXI6cf1ZrSH4nFc2hZcCFsHveRxit+J60N4MPkhtKinfW5Y3zZpIZy0rYLT72+QZKnjCn6O+ABK4BAXzSd7Dr1CU+3TSmUxLtIIqNIL41ln64sLYXPc/NiKahPJIdOcO3Mzs5tUr6kqcoPhGwZLoJQvkfEIMyXLs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wrkDZDfh; 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="wrkDZDfh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7732C4CEF7; Mon, 23 Mar 2026 16:14:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774282488; bh=S1fNEXoZG28aBjGUWm4TotGufZxaqaB8CJkQvQhW22I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wrkDZDfhjJJyep0Lm5XeAOpywPQssVvdfUzgR00G6cAFyI9QHX0J5eYxYD4IX5qb0 V7cST6lsMH54pUJ9GFa3eGgCHngUYxpgGCegXwPvQkSkhJoW40DV0fa6xXmb5c980r 6wwmM04N44F7+p9poBlGNX9veq3jkCEKzFSXR7TQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wenyuan Li <2063309626@qq.com>, Marc Kleine-Budde , Sasha Levin Subject: [PATCH 6.1 174/481] can: hi311x: hi3110_open(): add check for hi3110_power_enable() return value Date: Mon, 23 Mar 2026 14:42:36 +0100 Message-ID: <20260323134529.459777534@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134525.256603107@linuxfoundation.org> References: <20260323134525.256603107@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wenyuan Li <2063309626@qq.com> [ Upstream commit 47bba09b14fa21712398febf36cb14fd4fc3bded ] In hi3110_open(), the return value of hi3110_power_enable() is not checked. If power enable fails, the device may not function correctly, while the driver still returns success. Add a check for the return value and propagate the error accordingly. Signed-off-by: Wenyuan Li <2063309626@qq.com> Link: https://patch.msgid.link/tencent_B5E2E7528BB28AA8A2A56E16C49BD58B8B07@qq.com Fixes: 57e83fb9b746 ("can: hi311x: Add Holt HI-311x CAN driver") [mkl: adjust subject, commit message and jump label] Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- drivers/net/can/spi/hi311x.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c index 1acd4fc7adc8b..2038b864832c9 100644 --- a/drivers/net/can/spi/hi311x.c +++ b/drivers/net/can/spi/hi311x.c @@ -756,7 +756,9 @@ static int hi3110_open(struct net_device *net) return ret; mutex_lock(&priv->hi3110_lock); - hi3110_power_enable(priv->transceiver, 1); + ret = hi3110_power_enable(priv->transceiver, 1); + if (ret) + goto out_close_candev; priv->force_quit = 0; priv->tx_skb = NULL; @@ -791,6 +793,7 @@ static int hi3110_open(struct net_device *net) hi3110_hw_sleep(spi); out_close: hi3110_power_enable(priv->transceiver, 0); + out_close_candev: close_candev(net); mutex_unlock(&priv->hi3110_lock); return ret; -- 2.51.0