From nobody Sun Feb 8 13:09:07 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A2B8C433EF for ; Mon, 23 May 2022 17:08:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239629AbiEWRIr (ORCPT ); Mon, 23 May 2022 13:08:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239475AbiEWRHw (ORCPT ); Mon, 23 May 2022 13:07:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A781A3EB9E; Mon, 23 May 2022 10:07:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F089D614BF; Mon, 23 May 2022 17:07:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE2EAC385A9; Mon, 23 May 2022 17:07:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1653325668; bh=dtq5FuBVkY2H3IbPkUyxFDs+51izOINGRqjrJWWyk6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gYaMiVEIieBrdl/OpAR4AvScIK5VNI9QttY+cM7DqqLy5JVrQkV/P2ivDQBcsub/m nDvctzsZ6inZdOpZJhXuM6zEcJk8G1ab4/XfcdBssWich9MKSXJTTept/c2/1XFrot iwGp+LqsarhoAA8NOehNt7DCCQekfWeo84Njtx9c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiaoke Wang , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 4.14 05/33] MIPS: lantiq: check the return value of kzalloc() Date: Mon, 23 May 2022 19:04:54 +0200 Message-Id: <20220523165748.002453671@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220523165746.957506211@linuxfoundation.org> References: <20220523165746.957506211@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Xiaoke Wang [ Upstream commit 34123208bbcc8c884a0489f543a23fe9eebb5514 ] kzalloc() is a memory allocation function which can return NULL when some internal memory errors happen. So it is better to check the return value of it to prevent potential wrong memory access or memory leak. Signed-off-by: Xiaoke Wang Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/lantiq/falcon/sysctrl.c | 2 ++ arch/mips/lantiq/xway/gptu.c | 2 ++ arch/mips/lantiq/xway/sysctrl.c | 46 ++++++++++++++++++++----------- 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sy= sctrl.c index 82bbd0e2e298..714d92659489 100644 --- a/arch/mips/lantiq/falcon/sysctrl.c +++ b/arch/mips/lantiq/falcon/sysctrl.c @@ -169,6 +169,8 @@ static inline void clkdev_add_sys(const char *dev, unsi= gned int module, { struct clk *clk =3D kzalloc(sizeof(struct clk), GFP_KERNEL); =20 + if (!clk) + return; clk->cl.dev_id =3D dev; clk->cl.con_id =3D NULL; clk->cl.clk =3D clk; diff --git a/arch/mips/lantiq/xway/gptu.c b/arch/mips/lantiq/xway/gptu.c index e304aabd6678..7d4081d67d61 100644 --- a/arch/mips/lantiq/xway/gptu.c +++ b/arch/mips/lantiq/xway/gptu.c @@ -124,6 +124,8 @@ static inline void clkdev_add_gptu(struct device *dev, = const char *con, { struct clk *clk =3D kzalloc(sizeof(struct clk), GFP_KERNEL); =20 + if (!clk) + return; clk->cl.dev_id =3D dev_name(dev); clk->cl.con_id =3D con; clk->cl.clk =3D clk; diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctr= l.c index c05bed624075..1b1142c7bb85 100644 --- a/arch/mips/lantiq/xway/sysctrl.c +++ b/arch/mips/lantiq/xway/sysctrl.c @@ -313,6 +313,8 @@ static void clkdev_add_pmu(const char *dev, const char = *con, bool deactivate, { struct clk *clk =3D kzalloc(sizeof(struct clk), GFP_KERNEL); =20 + if (!clk) + return; clk->cl.dev_id =3D dev; clk->cl.con_id =3D con; clk->cl.clk =3D clk; @@ -336,6 +338,8 @@ static void clkdev_add_cgu(const char *dev, const char = *con, { struct clk *clk =3D kzalloc(sizeof(struct clk), GFP_KERNEL); =20 + if (!clk) + return; clk->cl.dev_id =3D dev; clk->cl.con_id =3D con; clk->cl.clk =3D clk; @@ -354,24 +358,28 @@ static void clkdev_add_pci(void) struct clk *clk_ext =3D kzalloc(sizeof(struct clk), GFP_KERNEL); =20 /* main pci clock */ - clk->cl.dev_id =3D "17000000.pci"; - clk->cl.con_id =3D NULL; - clk->cl.clk =3D clk; - clk->rate =3D CLOCK_33M; - clk->rates =3D valid_pci_rates; - clk->enable =3D pci_enable; - clk->disable =3D pmu_disable; - clk->module =3D 0; - clk->bits =3D PMU_PCI; - clkdev_add(&clk->cl); + if (clk) { + clk->cl.dev_id =3D "17000000.pci"; + clk->cl.con_id =3D NULL; + clk->cl.clk =3D clk; + clk->rate =3D CLOCK_33M; + clk->rates =3D valid_pci_rates; + clk->enable =3D pci_enable; + clk->disable =3D pmu_disable; + clk->module =3D 0; + clk->bits =3D PMU_PCI; + clkdev_add(&clk->cl); + } =20 /* use internal/external bus clock */ - clk_ext->cl.dev_id =3D "17000000.pci"; - clk_ext->cl.con_id =3D "external"; - clk_ext->cl.clk =3D clk_ext; - clk_ext->enable =3D pci_ext_enable; - clk_ext->disable =3D pci_ext_disable; - clkdev_add(&clk_ext->cl); + if (clk_ext) { + clk_ext->cl.dev_id =3D "17000000.pci"; + clk_ext->cl.con_id =3D "external"; + clk_ext->cl.clk =3D clk_ext; + clk_ext->enable =3D pci_ext_enable; + clk_ext->disable =3D pci_ext_disable; + clkdev_add(&clk_ext->cl); + } } =20 /* xway socs can generate clocks on gpio pins */ @@ -391,9 +399,15 @@ static void clkdev_add_clkout(void) char *name; =20 name =3D kzalloc(sizeof("clkout0"), GFP_KERNEL); + if (!name) + continue; sprintf(name, "clkout%d", i); =20 clk =3D kzalloc(sizeof(struct clk), GFP_KERNEL); + if (!clk) { + kfree(name); + continue; + } clk->cl.dev_id =3D "1f103000.cgu"; clk->cl.con_id =3D name; clk->cl.clk =3D clk; --=20 2.35.1