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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 BA4B7C10F03 for ; Wed, 13 Mar 2019 19:21:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 82479217F5 for ; Wed, 13 Mar 2019 19:21:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504882; bh=0Rk7hvGpvYbdIhAwK3OkC6mQHj9eG9RhHX4SkM+hkzs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=USbYZm19A1KSxGza9r+kmvc/eFcLcFpAzJerOXER+bcMuRoctz8JlNonMZP1D6qgZ sXR1Um3xONibEA16gXXJe7M5k8LVTFdZ/YewjDsj5ckl5ZzOOR3Lv/xkuRUVOG07ZW SCJ4wXjHIA6J3kacb8C+vcT7WFSQKbT67M4zgQDQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729056AbfCMTS1 (ORCPT ); Wed, 13 Mar 2019 15:18:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:48952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727354AbfCMTSZ (ORCPT ); Wed, 13 Mar 2019 15:18:25 -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 B35192075C; Wed, 13 Mar 2019 19:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504705; bh=0Rk7hvGpvYbdIhAwK3OkC6mQHj9eG9RhHX4SkM+hkzs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eTo/Svl7IdvF854ZDzqpcGmaJBm4xB4eSUHVfY4Y95IL5EMSotX3T8m7rnzHZeh4s K9Dhm8nQKW/79IjH89EZDpTGGQMUPF18GiV4i9mlbsxchiELg9YzFgvajLleucsjnt tyek2Gd7+rzzGmdBNc+QskF9SBRb4ZS+42NvhdWo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexey Khoroshilov , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 07/15] net: mv643xx_eth: disable clk on error path in mv643xx_eth_shared_probe() Date: Wed, 13 Mar 2019 15:17:53 -0400 Message-Id: <20190313191806.160547-7-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191806.160547-1-sashal@kernel.org> References: <20190313191806.160547-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alexey Khoroshilov [ Upstream commit e928b5d6b75e239feb9c6d5488974b6646a0ebc8 ] If mv643xx_eth_shared_of_probe() fails, mv643xx_eth_shared_probe() leaves clk enabled. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/mv643xx_eth.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 4182290fdbcf..82f080a5ed5c 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -2884,7 +2884,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) ret = mv643xx_eth_shared_of_probe(pdev); if (ret) - return ret; + goto err_put_clk; pd = dev_get_platdata(&pdev->dev); msp->tx_csum_limit = (pd != NULL && pd->tx_csum_limit) ? @@ -2892,6 +2892,11 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) infer_hw_params(msp); return 0; + +err_put_clk: + if (!IS_ERR(msp->clk)) + clk_disable_unprepare(msp->clk); + return ret; } static int mv643xx_eth_shared_remove(struct platform_device *pdev) -- 2.19.1