Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp2466519rdb; Tue, 12 Sep 2023 02:49:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHXkyXdNvn6xxFOGyfb6U2El93LKpaZRgwwHvclhPj4wuOVSsEojGm2eSF4sxavAE8UHmra X-Received: by 2002:a17:90a:fa02:b0:263:311f:9bcc with SMTP id cm2-20020a17090afa0200b00263311f9bccmr9926535pjb.35.1694512166009; Tue, 12 Sep 2023 02:49:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694512165; cv=none; d=google.com; s=arc-20160816; b=BB7NE6K9E/4J67C7ph7GnWKfW6whXwpExDNOyseg/JqbjB5+qFLHNL8ZiGfVUKTGtL U9B1JpcM3LT/SMLOUMlBvmNsbyuSwSNpOMo4FyFrbRQ8teTa5UbHWBsFPP8LUf3TrBfJ UYYDKIZ2ckkUH39F4V+s6X6rtM9FAC7hfMe5YyqcL7Qgu0ZMrV1Ne9GYcCS46uSQGpSV kCJhsVOOdq1E54r6OrYNSVTMQZk8bxJQcAMC9gaSuLE25ySBLeCrM1oHIPoittCbn4+5 npNJyrzS/lTOzsAAVbeTsNRd/ZQI8o8b8Xb+c2fsA8GXJO25AoLTKr4QD7nUxprPScT1 mIBg== 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=7m0zgUzC7hZXxjE6PjS4qjNbEjb1UteN16TAWsaIb/U=; fh=XwUC2i6lf7y/fd8X/MDFzCSCJu0/tnEglmS1GZ/ng7k=; b=xjG+hPvi/c4gsPljJFP9KJONyLzK68Tw768GsIdur6cy38k5XDq8TlC78+XRnm67ll hBvL6vrAdSac6VwhHtvVdiOoPYb2Q388xPMa4Z8gH6urzpTC1OeNU+mDzvEXZs7DD0SS uHSquybZPe6Meq6N34zkOD/IKWgHyCbohcBf7aiO2peSsxwHZMtbdePLhcnA5vS2S3hB UqVDy6hwOTCSg9q4A7LtAV2ASJH3ID1pYpPbEb8YRKa/tnXhykE/H8K2Kx27H63mwyvD A9Lso6dCZQ3xJcMJeVHC9M1Q9tbz95mRBluFwxVUdqZAKUzVrF1PP4OAP3E830bntNbe XWcA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id mi1-20020a17090b4b4100b0026343b62cdasi4484762pjb.154.2023.09.12.02.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 02:49:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 D9EAC81441B8; Tue, 12 Sep 2023 02:34:47 -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 S232357AbjILJef (ORCPT + 99 others); Tue, 12 Sep 2023 05:34:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230234AbjILJee (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 840FF116; 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--.38735S3; Tue, 12 Sep 2023 17:34:09 +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 2/5] clk: mediatek: clk-mt6779: Add check for mtk_alloc_clk_data Date: Tue, 12 Sep 2023 17:34:04 +0800 Message-Id: <20230912093407.21505-2-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--.38735S3 X-Coremail-Antispam: 1UD129KBjvdXoWrKFW5Jw18ZryDCw15GFykZrb_yoWkZFc_Xw 1kZrZrur1DtFn5Jr4UGw1xZrZ8Krs0vrykZ3s8tFW3J34fWF17A3yvvwsa9rsrWwn7Zr1D trn3GF4fuF15ZjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbyxFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY02 0Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1l84 ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8cxan2IY04 v7MxkIecxEwVAFwVW8uwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC2 0s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI 0_GFv_WrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv2 0xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87 Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIF yTuYvjfUYiiSDUUUU 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:34:48 -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: 710774e04861 ("clk: mediatek: Add MT6779 clock support") Signed-off-by: Jiasheng Jiang --- drivers/clk/mediatek/clk-mt6779.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/clk/mediatek/clk-mt6779.c b/drivers/clk/mediatek/clk-mt6779.c index 3ee2f5a2319a..ffedb1fe3c67 100644 --- a/drivers/clk/mediatek/clk-mt6779.c +++ b/drivers/clk/mediatek/clk-mt6779.c @@ -1217,6 +1217,8 @@ static int clk_mt6779_apmixed_probe(struct platform_device *pdev) struct device_node *node = pdev->dev.of_node; clk_data = mtk_alloc_clk_data(CLK_APMIXED_NR_CLK); + if (!clk_data) + return -ENOMEM; mtk_clk_register_plls(node, plls, ARRAY_SIZE(plls), clk_data); @@ -1237,6 +1239,8 @@ static int clk_mt6779_top_probe(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); -- 2.25.1