clk: tegra: dfll: Fix a potential Oop in remove()

Commit Message

Dan Carpenter Dec. 18, 2018, 8:22 a.m. UTC

If tegra_dfll_unregister() fails then "soc" is an error pointer.  We
should just return instead of dereferencing it.

Fixes: 1752c9ee23fb ("clk: tegra: dfll: Fix drvdata overwriting issue")
Signed-off-by: Dan Carpenter <[e-mail]>
---
 drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Stephen Boyd Jan. 9, 2019, 6:35 p.m. UTC | #1

Quoting Dan Carpenter (2018-12-18 00:22:41)
> If tegra_dfll_unregister() fails then "soc" is an error pointer.  We
> should just return instead of dereferencing it.
> 
> Fixes: 1752c9ee23fb ("clk: tegra: dfll: Fix drvdata overwriting issue")
> Signed-off-by: Dan Carpenter <[e-mail]>
> ---

Applied to clk-fixes

Patch

diff --git a/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c b/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c
index 269d3595758b..edc31bb56674 100644
--- a/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c
+++ b/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c
@@ -133,9 +133,11 @@  static int tegra124_dfll_fcpu_remove(struct platform_device *pdev)
 	struct tegra_dfll_soc_data *soc;
 
 	soc = tegra_dfll_unregister(pdev);
-	if (IS_ERR(soc))
+	if (IS_ERR(soc)) {
 		dev_err(&pdev->dev, "failed to unregister DFLL: %ld\n",
 			PTR_ERR(soc));
+		return PTR_ERR(soc);
+	}
 
 	tegra_cvb_remove_opp_table(soc->dev, soc->cvb, soc->max_freq);