Received: by 2002:a05:7412:3210:b0:e2:908c:2ebd with SMTP id eu16csp1015068rdb; Fri, 1 Sep 2023 10:08:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHFc01jWI+JmCgq+EtwcxGZdz9eCaZ5eGtUnJlw3olCIyTpoqD/CVbGtDzbABX6Xjvy/PMU X-Received: by 2002:a05:6a00:1708:b0:68a:6d1a:b812 with SMTP id h8-20020a056a00170800b0068a6d1ab812mr4314342pfc.9.1693588134556; Fri, 01 Sep 2023 10:08:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693588134; cv=none; d=google.com; s=arc-20160816; b=bpliB+PmtzxcPyYl5kd3cewBF6G1Jp6riareWqI6gSE9Qr8dTz4E8ykIWoLG/iYuJD 4aKVFY7lY73W4A28F3Dixc2UFcYm9VzF5upA2Deq3V/5TIo9aWP0N3ALeHkRLB1f4eFk Mv2kT52PdSmLCJStqM5LjOeaNGHnHRc/7/Vpa4S3iLUIe36aVjo3Pn25Z+yl1Fdkcr5V CJxVnV4omP1KWrwe/VdXUUQG3vqgNQlD3tttRyIZJsfNbbUsYvcjtj6ky5N+C6dsCnHx LZ5JopmPgcPKiz1qaw8RfI7fhfUc/jmMe9cMH7z8g9B9KkBWiMhsVcPTpfIuJR0UWtjF 5ByQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=YSSKrAlT9LqLa+EpCEjeqM9LEiQQgMdGWZFDD5qJ9IQ=; fh=G9hp42Di7KKx/BrVO1uApa+1YeImOBo3kEBoaX1jOko=; b=yY8nm2c6khlY1KYZk80wFs/QJpR8dW/5WoucJdCeYISqL6EMzN3GQVrsjKC7GUXFDE jIDK9BGZDfHgrE6iP+QMhwLtilFpU/WPfyEji68hSJTTmEfbWFA0RzEHdWnCvMJQx0To N5F5LHZIq2l4KAFmxMgNviJMtS3t2csoNva7zSkza6Yv+KLHuNRpu1ixHD8rZkpvi9kK up/xESzrxE5UszJgjyDkF5JDmaVnG4L6lUj293/45AesHrHfVgbWem2TsCvawbYNHxlY OYF6+0NzfSUki17Dsw9KujoU8Eqx5Cz4//WUBaET9O1ZvqJftanUHMUM3EOCSltfz1Yf Edww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j5-20020a056a00174500b0068a5877bfc8si3185069pfc.35.2023.09.01.10.08.31; Fri, 01 Sep 2023 10:08:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348183AbjIACrr (ORCPT + 99 others); Thu, 31 Aug 2023 22:47:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230052AbjIACrq (ORCPT ); Thu, 31 Aug 2023 22:47:46 -0400 Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 387C7E40 for ; Thu, 31 Aug 2023 19:47:42 -0700 (PDT) Received: from 4d92782a4194.home.arpa (unknown [124.16.138.129]) by APP-05 (Coremail) with SMTP id zQCowAAHD1eoUPFkj_PaCA--.40644S2; Fri, 01 Sep 2023 10:47:04 +0800 (CST) From: Jiasheng Jiang To: mturquette@baylibre.com, sboyd@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, wenst@chromium.org, msp@baylibre.com, frank.li@vivo.com, robh@kernel.org, jamesjj.liao@mediatek.com, shunli.wang@mediatek.com, erin.lo@mediatek.com Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Jiasheng Jiang Subject: [PATCH] clk: mediatek: clk-mt2701: Add check for mtk_alloc_clk_data Date: Fri, 1 Sep 2023 10:46:58 +0800 Message-Id: <20230901024658.23405-1-jiasheng@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAAHD1eoUPFkj_PaCA--.40644S2 X-Coremail-Antispam: 1UD129KBjvJXoW7uF1xXFW3Aw4kuw4kWr4rKrg_yoW8AF1kpr WkKF1YyFyUGw17Grs5Jr4DC3W5Aw10ga4UtFy3Zw1rZr13KrWUAF1F9a4vk3Z2yrWv9FyU X3WY9w409FWDuFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvC14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j 6r4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2 Y2ka0xkIwI1lc2xSY4AK67AK6r4UMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r 1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CE b7AF67AKxVW8ZVWrXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0x vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAI cVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2Kf nxnUUI43ZEXa7VUbpwZ7UUUUU== X-Originating-IP: [124.16.138.129] X-CM-SenderInfo: pmld2xxhqjqxpvfd2hldfou0/ X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the check for the return value of mtk_alloc_clk_data() in order to avoid NULL pointer dereference. Fixes: e9862118272a ("clk: mediatek: Add MT2701 clock support") Signed-off-by: Jiasheng Jiang --- drivers/clk/mediatek/clk-mt2701.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/clk/mediatek/clk-mt2701.c b/drivers/clk/mediatek/clk-mt2701.c index c81f3e33ce56..12d9560eb4ba 100644 --- a/drivers/clk/mediatek/clk-mt2701.c +++ b/drivers/clk/mediatek/clk-mt2701.c @@ -667,6 +667,8 @@ static int mtk_topckgen_init(struct platform_device *pdev) return PTR_ERR(base); clk_data = mtk_alloc_clk_data(CLK_TOP_NR); + if (!clk_data) + return -ENOMEM; mtk_clk_register_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks), clk_data); @@ -747,6 +749,8 @@ static void __init mtk_infrasys_init_early(struct device_node *node) if (!infra_clk_data) { infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR); + if (!infra_clk_data) + return; for (i = 0; i < CLK_INFRA_NR; i++) infra_clk_data->hws[i] = ERR_PTR(-EPROBE_DEFER); @@ -774,6 +778,8 @@ static int mtk_infrasys_init(struct platform_device *pdev) if (!infra_clk_data) { infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR); + if (!infra_clk_data) + return -ENOMEM; } else { for (i = 0; i < CLK_INFRA_NR; i++) { if (infra_clk_data->hws[i] == ERR_PTR(-EPROBE_DEFER)) @@ -890,6 +896,8 @@ static int mtk_pericfg_init(struct platform_device *pdev) return PTR_ERR(base); clk_data = mtk_alloc_clk_data(CLK_PERI_NR); + if (!clk_data) + return -ENOMEM; mtk_clk_register_gates(&pdev->dev, node, peri_clks, ARRAY_SIZE(peri_clks), clk_data); -- 2.25.1