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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 12DF5C43381 for ; Mon, 4 Mar 2019 08:32:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7F35208E4 for ; Mon, 4 Mar 2019 08:32:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551688352; bh=ApUOPnhaPhv2WLSZGbf/HOsM0YCgp3dXP50Yaz3xeVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PnqapeMc9I5+kY/hyPDXnlttVFw+k4JP1eFOLuShHZeAoIMYrDrbO3vraivgIymEd fJDYnJtlkq9mi0u9LEf3bdj+PLLmG+xPJMbyg+vzLo4BhK+Kgk2ZevByuHIhsdEUT0 Txr4PWzwkLhQQ7inwGUyWnyITZHcKuHK8vu5eAq4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726630AbfCDIc0 (ORCPT ); Mon, 4 Mar 2019 03:32:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:35780 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728072AbfCDIcZ (ORCPT ); Mon, 4 Mar 2019 03:32:25 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 025E120836; Mon, 4 Mar 2019 08:32:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551688344; bh=ApUOPnhaPhv2WLSZGbf/HOsM0YCgp3dXP50Yaz3xeVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q4hMJuOr4pYg2yy3C6iaEeQhi/9FlSeRopnIank8x20vsBpeD2EfZcddSUr0zQR+o 1MvNsI0iC6jTzah9MMClR23kdMdu0woB67zkWjW1DhOrVc0SR8c4cdefcaE32FwklC J41l1nqpFk6e7qKyT8bD0XP6yfH2GQRlZ8iACL9Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Stephen Boyd , Sasha Levin Subject: [PATCH 4.20 08/88] clk: tegra: dfll: Fix a potential Oop in remove() Date: Mon, 4 Mar 2019 09:21:51 +0100 Message-Id: <20190304081630.903151156@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190304081630.610632175@linuxfoundation.org> References: <20190304081630.610632175@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit d39eca547f3ec67140a5d765a426eb157b978a59 ] 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 Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c b/drivers/clk/tegra/clk-tegra124-dfll-fcpu.c index 269d3595758be..edc31bb56674a 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); -- 2.19.1