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 B486A148850; Tue, 17 Dec 2024 17:15:23 +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=1734455723; cv=none; b=GyGeDhSAS/irzN6Hq1mN2NApnMvRnC5wWpR3sEZVemzhKeB+2yQrTYgivOhjwlz7Hd3mbTabcAGGzOqrvS5jpB9vmci5wyT2zU1w1UlQpt3HMF8C+CTjrlT0c31J9WMeCIuQbN6E045C3VfxbBFMOOthKlh8UMvYrvDCz+pnxks= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734455723; c=relaxed/simple; bh=kHMqqIsmkFvSWHjNseVgQFevvE4AGRUcocViyBnSmLk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mH/M+DU3nZktuLgQkZUA8h2cC1RYJ0zzz0yQWLrYbE5RZaCyg0Zb10FvpQCsT7ncK6J9PP9lbLbiUCUE1UUZsZdYP1Tzqg+7tWVT5f8yHGWR121NhPXkUEaRNxT2TORzgS8HV17jzUTg1EWjCrj2ixebPKfJRDzbKY3TFX87dkc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=q7XD/2Rq; 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="q7XD/2Rq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F7D5C4CED3; Tue, 17 Dec 2024 17:15:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734455723; bh=kHMqqIsmkFvSWHjNseVgQFevvE4AGRUcocViyBnSmLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q7XD/2RqS0j2CxlWGrnRAhsvHOtkhU80WxN3eEheBtPE4VdeJLNT2m56HMizfrz3Z kPzEVnKFR040xa4Cxgn0xxnFmWVG2Sjv6rulMv7Qn0t//WFMqtuXfPvAMJp9wd241a BU+Am/G5a6vou0C/nnOmNd0NGpVP8Ua6WL0kHwDo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vitalii Mordan , Alan Stern Subject: [PATCH 6.1 11/76] usb: ehci-hcd: fix call balance of clocks handling routines Date: Tue, 17 Dec 2024 18:06:51 +0100 Message-ID: <20241217170526.717701172@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241217170526.232803729@linuxfoundation.org> References: <20241217170526.232803729@linuxfoundation.org> User-Agent: quilt/0.67 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: Vitalii Mordan commit 97264eaaba0122a5b7e8ddd7bf4ff3ac57c2b170 upstream. If the clocks priv->iclk and priv->fclk were not enabled in ehci_hcd_sh_probe, they should not be disabled in any path. Conversely, if they was enabled in ehci_hcd_sh_probe, they must be disabled in all error paths to ensure proper cleanup. Found by Linux Verification Center (linuxtesting.org) with Klever. Fixes: 63c845522263 ("usb: ehci-hcd: Add support for SuperH EHCI.") Cc: stable@vger.kernel.org # ff30bd6a6618: sh: clk: Fix clk_enable() to return 0 on NULL clk Signed-off-by: Vitalii Mordan Reviewed-by: Alan Stern Link: https://lore.kernel.org/r/20241121114700.2100520-1-mordan@ispras.ru Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/ehci-sh.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- a/drivers/usb/host/ehci-sh.c +++ b/drivers/usb/host/ehci-sh.c @@ -120,8 +120,12 @@ static int ehci_hcd_sh_probe(struct plat if (IS_ERR(priv->iclk)) priv->iclk = NULL; - clk_enable(priv->fclk); - clk_enable(priv->iclk); + ret = clk_enable(priv->fclk); + if (ret) + goto fail_request_resource; + ret = clk_enable(priv->iclk); + if (ret) + goto fail_iclk; ret = usb_add_hcd(hcd, irq, IRQF_SHARED); if (ret != 0) { @@ -137,6 +141,7 @@ static int ehci_hcd_sh_probe(struct plat fail_add_hcd: clk_disable(priv->iclk); +fail_iclk: clk_disable(priv->fclk); fail_request_resource: