Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp2464979rdb; Tue, 12 Sep 2023 02:45:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEvTHgGHLuGIRMO+juufb+5ct30Bv7zcJI22AxG0pELe5aoLVS9r0EI1njBYmIL0nAuFx4l X-Received: by 2002:a05:6358:6f92:b0:139:5a46:ea7e with SMTP id s18-20020a0563586f9200b001395a46ea7emr11977094rwn.28.1694511917669; Tue, 12 Sep 2023 02:45:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694511917; cv=none; d=google.com; s=arc-20160816; b=lqqG8UnTRvIy5HoHBrykTWKonPBukDJDZxa+l94MKGLcrahgaUyl1QEXfpcFGpojRY E0kZrzOoXg/QOHvD8mE0Pl25NU03HlFGBgXyMvTPzTJ4xTDe4nkpx9ZB9tghfrz4Tl5o nl2A2UX7J0gtRQUXFdgUZiga4FtBgqEC3da8cz1wZrCHzRv3gIlWw0BHdItzAp1XBFUG Mm1hxgF/B6XpbwGdBtkiZU6SlTdDeRepXFIUKCs6rTPrtb+g8OfJXjdUlxUVq2A7o6w0 gh0qDpM4ewRa9vkysoZruhSUwQE2X7JrZp7IRsdl0bUScOunfmtl3jIbo0+0a7nouY10 ncZg== 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=0OhkFkZjmfKSj4FXfEd+OUnVK90G2hWG7YlnJwJsN38=; fh=XwUC2i6lf7y/fd8X/MDFzCSCJu0/tnEglmS1GZ/ng7k=; b=D6d3EeK0Y4oHsBKduRdcWhTkeMHpaLdriy8hWagC17fmhWqbkOWqxQWLj7hP/68M26 TwNtD/V2CDM16NxZyBymxGqr2K2OsFy4ukcJMySMevmotn25TAiut3aq3SrISwkHan2m 82Z6q+uNZp+N7jE67TzuozOwhNYj8zJPY4zQVAnGxRKIWqfsEds7jlt+daE6AoPo97sp KYfNscscz+ltVj7nQ2eBw1HMVpVe5fN/WiDr9w5mgu+txHDB8iixeKp40ZCQ1LKVPaK4 zNUbdU9NTKy7Y3CDQYlYQWuqp+FrwM5LopWOtZzQ1FQmafcxG3PXcVb9CodtVndTRtf1 +7HA== 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 i71-20020a636d4a000000b00573f7d7890dsi7524152pgc.19.2023.09.12.02.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 02:45:17 -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 14A748177112; Tue, 12 Sep 2023 02:34:44 -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 S232428AbjILJeg (ORCPT + 99 others); Tue, 12 Sep 2023 05:34:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230057AbjILJee (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 8441A118; 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--.38735S5; Tue, 12 Sep 2023 17:34:10 +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 4/5] clk: mediatek: clk-mt7629-eth: Add check for mtk_alloc_clk_data Date: Tue, 12 Sep 2023 17:34:06 +0800 Message-Id: <20230912093407.21505-4-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--.38735S5 X-Coremail-Antispam: 1UD129KBjvdXoWrKFW5Jw18ZF13WFykZw45GFg_yoWkCrc_W3 Wkur9rZr1DKFyfCr4Utwn3Ary8tFsYvr1DZr1YgrsxtryruFnxZrZFvwsYkw4xWws3Zr90 yrn5GrW3Zr1ayjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbk8FF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY02 0Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM2 8EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kIc2 xKxwCY02Avz4vE14v_GFWl42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1l x2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14 v26r4a6rW5MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IY x2IY6xkF7I0E14v26r4UJVWxJr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4 A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73 UjIFyTuYvjfUOUDGUUUUU 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:44 -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-eth.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/clk/mediatek/clk-mt7629-eth.c b/drivers/clk/mediatek/clk-mt7629-eth.c index fe714debdc9e..1bfedc988cfe 100644 --- a/drivers/clk/mediatek/clk-mt7629-eth.c +++ b/drivers/clk/mediatek/clk-mt7629-eth.c @@ -77,6 +77,8 @@ static int clk_mt7629_ethsys_init(struct platform_device *pdev) int r; clk_data = mtk_alloc_clk_data(CLK_ETH_NR_CLK); + if (!clk_data) + return -ENOMEM; mtk_clk_register_gates(&pdev->dev, node, eth_clks, CLK_ETH_NR_CLK, clk_data); @@ -100,6 +102,8 @@ static int clk_mt7629_sgmiisys_init(struct platform_device *pdev) int r; clk_data = mtk_alloc_clk_data(CLK_SGMII_NR_CLK); + if (!clk_data) + return -ENOMEM; mtk_clk_register_gates(&pdev->dev, node, sgmii_clks[id++], CLK_SGMII_NR_CLK, clk_data); -- 2.25.1