From patchwork Tue Dec 3 22:34:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 180741 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2146372ile; Tue, 3 Dec 2019 14:39:43 -0800 (PST) X-Google-Smtp-Source: APXvYqyugVa+jT2638l6FS9XRlX0qbIWQueRp7PafwSN6s+U6ZrFOCFSv11hRYnkD262YnvyUmoX X-Received: by 2002:a54:4407:: with SMTP id k7mr1559oiw.56.1575412783745; Tue, 03 Dec 2019 14:39:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575412783; cv=none; d=google.com; s=arc-20160816; b=JKY1RwBT2CPW6QmuuDeTl+fRznLOAfdfnOgSUHezKGKpvdQj5MVpzJC06SHoyrVKMa Iapl7wYbfXK0cRzWcRFplQMlk04Ya6o/3Zplt2xp2ka84L+kwKszgfW8xtsX3AX9cXyK s2SqE3+CbhjB+xt/OzhfTdMZBK6EQ+7MK6YPN+PEbWVUZJi0fmYXF9BUzxjPhC1JGM/4 ym2GDCO5faB1SYyMp1+izCkAL2UKb9pD0ekrcyyzij/htqsmxk3Qgi3QMQ9t3nDyjPGB TUv3R6DBhuV7LjsHsVXd/Z83ZiIB72xOVwGKjy3Q0R6KkX4p1AKyuKK0EHylMmjgP9sM Ujrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MpYpKoER+nEwa98/IMDJV2lvw/wCzf18PtNKJUxDbgM=; b=jP37Ir0/2vKt1Vg3pIZD0Bik1eqFFzV2e0C2uFvskUxjxZWzVGQPTjmR3KsiTjFdyR GYhUkHhrcI9I/MOEFgPWt8TolzzoYonxjd4+vvB60PU9Y8XLvQwDj6ceuH5Q3wLRlsP7 8Yw6VEfhCPk4hEwBW+Zr6rVvvv20WmQqVW/GAv8nuSfPuy+Ns7VJ+CR4OHWxjXa5rayU +zQKdWmk6doG2ayL5YK2tD+XHqFSyKgY6nqsw9iYonJdXoqEZs4Qok7xGAlrPDnJ5PO2 SaYHLInMp6wqXx0K/ekge1AbJ8XfieDwkgR+LPTZsx9n93Cvo5CiK29NVcib/nW9ozSu OMBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mej2Hppy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v2si2538130otf.58.2019.12.03.14.39.43; Tue, 03 Dec 2019 14:39:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mej2Hppy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728275AbfLCWjm (ORCPT + 27 others); Tue, 3 Dec 2019 17:39:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:50200 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728266AbfLCWjk (ORCPT ); Tue, 3 Dec 2019 17:39:40 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 1AECC20684; Tue, 3 Dec 2019 22:39:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575412779; bh=agtIT+Fb/8Aqb7w95t51UZyWZdd2rx3ZbCQuZGwZNb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mej2HppyD1vhLBzvdmWJES6igAH/QLAjclpL9sc3FaQ+PV/BuCfNVH2mmFDJi+/5B 4LfU5ciWjb0yEVFv6HzlCGxDbyGPyUmeE0300/zk3v5QSCrm2fIh3VVlALEL5TgVYr /ALYqfxbFkziMjpUgbsAQdPTg8UMiNvR8uCqTd5c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Szyprowski , Krzysztof Kozlowski , Chanwoo Choi , kbuild test robot , Sylwester Nawrocki , Sasha Levin Subject: [PATCH 5.3 014/135] clk: samsung: exynos5433: Fix error paths Date: Tue, 3 Dec 2019 23:34:14 +0100 Message-Id: <20191203213008.174948129@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203213005.828543156@linuxfoundation.org> References: <20191203213005.828543156@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marek Szyprowski [ Upstream commit faac3604d05e8015567124e5ee79edc3f1568a89 ] Add checking the value returned by samsung_clk_alloc_reg_dump() and devm_kcalloc(). While fixing this, also release all gathered clocks. Fixes: 523d3de41f02 ("clk: samsung: exynos5433: Add support for runtime PM") Signed-off-by: Marek Szyprowski Reviewed-by: Krzysztof Kozlowski Acked-by: Chanwoo Choi [s.nawrocki: squashed patch from K. Kozlowski adding missing slab.h header] Reported-by: kbuild test robot Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sylwester Nawrocki Signed-off-by: Sasha Levin --- drivers/clk/samsung/clk-exynos5433.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/clk/samsung/clk-exynos5433.c b/drivers/clk/samsung/clk-exynos5433.c index 7824c2ba3d8e6..4b1aa9382ad28 100644 --- a/drivers/clk/samsung/clk-exynos5433.c +++ b/drivers/clk/samsung/clk-exynos5433.c @@ -13,6 +13,7 @@ #include #include #include +#include #include @@ -5584,6 +5585,8 @@ static int __init exynos5433_cmu_probe(struct platform_device *pdev) data->clk_save = samsung_clk_alloc_reg_dump(info->clk_regs, info->nr_clk_regs); + if (!data->clk_save) + return -ENOMEM; data->nr_clk_save = info->nr_clk_regs; data->clk_suspend = info->suspend_regs; data->nr_clk_suspend = info->nr_suspend_regs; @@ -5592,12 +5595,19 @@ static int __init exynos5433_cmu_probe(struct platform_device *pdev) if (data->nr_pclks > 0) { data->pclks = devm_kcalloc(dev, sizeof(struct clk *), data->nr_pclks, GFP_KERNEL); - + if (!data->pclks) { + kfree(data->clk_save); + return -ENOMEM; + } for (i = 0; i < data->nr_pclks; i++) { struct clk *clk = of_clk_get(dev->of_node, i); - if (IS_ERR(clk)) + if (IS_ERR(clk)) { + kfree(data->clk_save); + while (--i >= 0) + clk_put(data->pclks[i]); return PTR_ERR(clk); + } data->pclks[i] = clk; } }