Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp2465334rdb; Tue, 12 Sep 2023 02:46:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHKk19Ilpov/0D3mVpDRUR0sv6IAbtsA6cqqNIPOYynvEK0I9z93kDBk0ZAKUdlwSMFfRAu X-Received: by 2002:a17:902:650f:b0:1bc:224a:45c2 with SMTP id b15-20020a170902650f00b001bc224a45c2mr2654914plk.15.1694511972799; Tue, 12 Sep 2023 02:46:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694511972; cv=none; d=google.com; s=arc-20160816; b=oA7mso/rv0mzOO/kX4ZHLp9Z+nWmN1+7MmH8lrO4OmAXJR5oElmN0vAfj254upDNlP jC3nOgBBlLINc+O9ksPffUY5OXtEEHDtKfDfBTxXdc8ayOjsrP2OVU42L/idy2XJY9VI zV45UfURswkLMg0gQz3BzhM9bBFfEp1D5bomleW3KIfsP2lq8eMCY+1kD07RL46ZUfxh 5j112I8+CHppxgJ9EJClLt4PW8FIacA1efkYWhHO95I5kq8A9Uv4kN2YuWySX/q6jegM Bk+tWgFNTUMTGvwQek0OoDNOpv5kCi+wdI0lW9F4SWfeItiOjUFyD9wTefSY6QKnwhFQ svDQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=7nfHrNwxsf6pM72zJKjQ7URtJR3vxdQS+5Agqv2xtf0=; fh=XwUC2i6lf7y/fd8X/MDFzCSCJu0/tnEglmS1GZ/ng7k=; b=foyMgMpS6UjdStJtKUBuPGVwXBdlvL0g+t8mPIfL02FJKq91rZllYD4xVzC+ialGcv TgBKviX7JiGM8w2AsrXSv+ePfdFawIlbc4kpbjkkNvi7O3+dDUnZmpp9zScVLau7W5BT +kTeGqWK1ER4dnvJZDo32POVjOh+7PtJt0g8pHx9YL3o/CgsKbJYF4oIO/8DS4JlNko4 vYGihTXtYEhfUm27O/jZ+GPqCOA1A5sRtfqux0gRmRbon1Z38lXstRPpI9VMouPNHK6X AT9suwL8JHQYeiuGrm8Ru2KCLY6QMRk4iTEvr1vsCHNsJYnzzC2vBJr+yuRI8s85QlyE sodg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id p11-20020a170902eacb00b001b89b77ce99si7700083pld.458.2023.09.12.02.46.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 02:46:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 97239817169A; Tue, 12 Sep 2023 02:35:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232601AbjILJem (ORCPT + 99 others); Tue, 12 Sep 2023 05:34:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232143AbjILJee (ORCPT ); Tue, 12 Sep 2023 05:34:34 -0400 Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD21ACD; Tue, 12 Sep 2023 02:34:29 -0700 (PDT) Received: from 4d92782a4194.home.arpa (unknown [124.16.138.129]) by APP-05 (Coremail) with SMTP id zQCowAB3kQiQMABlcnFXDA--.38735S6; Tue, 12 Sep 2023 17:34:11 +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, amergnat@baylibre.com, frank.li@vivo.com, robh@kernel.org, owen.chen@mediatek.com, mars.cheng@mediatek.com, macpaul.lin@mediatek.com, cw00.choi@samsung.com, u.kleine-koenig@pengutronix.de, wendell.lin@mediatek.com, luca.ceresoli@bootlin.com, kevin-cw.chen@mediatek.com, ryder.lee@mediatek.com, wenzhen.yu@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 5/5] clk: mediatek: clk-mt7629: Add check for mtk_alloc_clk_data Date: Tue, 12 Sep 2023 17:34:07 +0800 Message-Id: <20230912093407.21505-5-jiasheng@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230912093407.21505-1-jiasheng@iscas.ac.cn> References: <20230912093407.21505-1-jiasheng@iscas.ac.cn> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAB3kQiQMABlcnFXDA--.38735S6 X-Coremail-Antispam: 1UD129KBjvJXoW7uF1xXFW5Zw4xtryxuF1DAwb_yoW8Xr4kpr ykKr1YyFyUKw47Gws5Jw4qk3W5Zw10ga4UtFy3Zw10qr1agrW7CFyFkas29an2yrWv9Fyj qw1Y9w4xuFW7uFDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUmF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE 3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2I x0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8 JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2Y2 ka0xkIwI1lc2xSY4AK67AK6r4fMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j 6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7 AF67AKxVW8ZVWrXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE 2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42 IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2 KfnxnUUI43ZEXa7VUbaLvtUUUUU== X-Originating-IP: [124.16.138.129] X-CM-SenderInfo: pmld2xxhqjqxpvfd2hldfou0/ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 12 Sep 2023 02:35:04 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Add the check for the return value of mtk_alloc_clk_data() in order to avoid NULL pointer dereference. Fixes: 3b5e748615e7 ("clk: mediatek: add clock support for MT7629 SoC") Signed-off-by: Jiasheng Jiang --- drivers/clk/mediatek/clk-mt7629.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/clk/mediatek/clk-mt7629.c b/drivers/clk/mediatek/clk-mt7629.c index 2882107d0f24..b8a1f01bc974 100644 --- a/drivers/clk/mediatek/clk-mt7629.c +++ b/drivers/clk/mediatek/clk-mt7629.c @@ -555,6 +555,8 @@ static int mtk_topckgen_init(struct platform_device *pdev) return PTR_ERR(base); clk_data = mtk_alloc_clk_data(CLK_TOP_NR_CLK); + if (!clk_data) + return -ENOMEM; mtk_clk_register_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks), clk_data); @@ -579,6 +581,8 @@ static int mtk_infrasys_init(struct platform_device *pdev) struct clk_hw_onecell_data *clk_data; clk_data = mtk_alloc_clk_data(CLK_INFRA_NR_CLK); + if (!clk_data) + return -ENOMEM; mtk_clk_register_gates(&pdev->dev, node, infra_clks, ARRAY_SIZE(infra_clks), clk_data); @@ -602,6 +606,8 @@ static int mtk_pericfg_init(struct platform_device *pdev) return PTR_ERR(base); clk_data = mtk_alloc_clk_data(CLK_PERI_NR_CLK); + if (!clk_data) + return -ENOMEM; mtk_clk_register_gates(&pdev->dev, node, peri_clks, ARRAY_SIZE(peri_clks), clk_data); -- 2.25.1