From nobody Mon Feb 9 10:39:34 2026 Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C26F30DEA7; Wed, 21 Jan 2026 01:22:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.84 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958579; cv=none; b=NQW7UR1noVaaMfTgKa82KQIS3Wqd0VARbDZlXrqICjjN8ft9UcbA7wZ7y1de1vZjNfM8QSZuKCOB1PjZDY8Wenzi5SKWa8ysF6OUbVejUsbr/nT93b2rDtWMcwdlE1xzHuiUN4CKvWZH9dJfl7IjDir00HbcGHNf42ut/qutbXQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958579; c=relaxed/simple; bh=B6kvndOuGcIDLEeK2haT6VFwiZMfgxKr5nxP7WS9dNs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LAyjX7YLhmL5NuV83fdM4fMv4gT7dZ5xHGia5HePYOXScqVG7Sfgg0f38OIGKFHGoMlNWVjrQhV2k0YHfPeXMquXSob/v2NKMjel53mdhCa+kpXXJ5iaYUUTnlkRcvNFYcVdjoJZ0YiAAnAdHXVHa//oUJjFBWG/s2Og9tY3m3I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn; spf=pass smtp.mailfrom=isrc.iscas.ac.cn; arc=none smtp.client-ip=159.226.251.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isrc.iscas.ac.cn Received: from localhost.localdomain (unknown [36.112.3.108]) by APP-05 (Coremail) with SMTP id zQCowAB3zhFdKnBpw6_aBQ--.10840S3; Wed, 21 Jan 2026 09:22:41 +0800 (CST) From: Haoxiang Li To: mturquette@baylibre.com, sboyd@kernel.org, bmasney@redhat.com Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Haoxiang Li , stable@vger.kernel.org Subject: [PATCH v2 1/7] clk: st: clkgen-pll: Fix a memory leak in clkgen_odf_register() Date: Wed, 21 Jan 2026 09:22:17 +0800 Message-Id: <20260121012223.186199-2-lihaoxiang@isrc.iscas.ac.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> References: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: zQCowAB3zhFdKnBpw6_aBQ--.10840S3 X-Coremail-Antispam: 1UD129KBjvdXoWrKFyftw4rJw4rXr13Gr1rJFb_yoWfCwbEyr W2q3sav34rCF43A3WUAw47ZryF93Wkurn3Wa1ftrW5K34UXry8KrWFq395Jr15WFWrCryD Gws7J3s8Cr47ZjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbhAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY02 0Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwA2z4 x0Y4vEx4A2jsIE14v26r1j6r4UM28EF7xvwVC2z280aVCY1x0267AKxVW8JVW8Jr1le2I2 62IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcV AFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG 0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc7CjxVAaw2AFwI0_JF0_Jw1l42 xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWU GwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI4 8JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4U MIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I 8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUemhwUUUUU X-CM-SenderInfo: 5olkt0x0ld0ww6lv2u4olvutnvoduhdfq/1tbiDAYOE2lwF8I5OgAAsY Content-Type: text/plain; charset="utf-8" If clk_register_composite() fails, call kfree() to release div and gate. Fixes: b9b8e614b580 ("clk: st: Support for PLLs inside ClockGenA(s)") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Reviewed-by: Brian Masney --- drivers/clk/st/clkgen-pll.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/clk/st/clkgen-pll.c b/drivers/clk/st/clkgen-pll.c index c258ff87a171..a7d605b52cf3 100644 --- a/drivers/clk/st/clkgen-pll.c +++ b/drivers/clk/st/clkgen-pll.c @@ -742,8 +742,11 @@ static struct clk * __init clkgen_odf_register(const c= har *parent_name, &div->hw, &clk_divider_ops, &gate->hw, &clk_gate_ops, flags); - if (IS_ERR(clk)) + if (IS_ERR(clk)) { + kfree(div); + kfree(gate); return clk; + } =20 pr_debug("%s: parent %s rate %lu\n", __clk_get_name(clk), --=20 2.25.1 From nobody Mon Feb 9 10:39:34 2026 Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1020883A14; Wed, 21 Jan 2026 01:22:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.84 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958573; cv=none; b=VGzneCPMpb4uk2bcjUPZ4nCMlBYefoWmX9Ke9SVMvE9BYtcHZofbGMD4tj7ZZdwNHAcD6HsDW0RXJqLmd1ccX+WEy8MlgObFDofmmzlkHa7dI7dhKnsFC4SA69D7VsYkZWkCEfgtGMM9zI5RHl5EjsyWjli0qYILc9zmPKsECYY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958573; c=relaxed/simple; bh=ZMEWGOcfFueyQibIPDY+E98bH9xh39FTWTKBYuHVgQc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cEuZbmsiEtSjfn/GO+A+D5wjbQLfqLaWxcABoiOWseNQI7g5cRSxJh4Wq+ZlYpBxHbQNr8DIeUBDOfauBoDjHcApwxocd4c/35QB7vJ3B2Ry/Nj6B85PVp7IeTyrpTKdWmcOzfNn/tHfn5d0vIRosoTtl5NKHD7ZezdPglA4MHM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn; spf=pass smtp.mailfrom=isrc.iscas.ac.cn; arc=none smtp.client-ip=159.226.251.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isrc.iscas.ac.cn Received: from localhost.localdomain (unknown [36.112.3.108]) by APP-05 (Coremail) with SMTP id zQCowAB3zhFdKnBpw6_aBQ--.10840S4; Wed, 21 Jan 2026 09:22:42 +0800 (CST) From: Haoxiang Li To: mturquette@baylibre.com, sboyd@kernel.org, bmasney@redhat.com Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Haoxiang Li Subject: [PATCH v2 2/7] clk: st: clkgen-pll: Rename clk variable in clkgen_c32_pll_setup() Date: Wed, 21 Jan 2026 09:22:18 +0800 Message-Id: <20260121012223.186199-3-lihaoxiang@isrc.iscas.ac.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> References: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: zQCowAB3zhFdKnBpw6_aBQ--.10840S4 X-Coremail-Antispam: 1UD129KBjvJXoW7CrW5tF15Zw1fXFWrGw1UGFg_yoW8Ary3pa 48Ga43Z3s8XF4DuFs5JrWkuF90g3Z7KFy7CrWDKw1F9wsxXryrJr45Xa4xur15u3yxuFW3 tF4qvry8ZF4UtFUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBl14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1l84 ACjcxK6I8E87Iv67AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxkF7I0En4kS14v26r126r1DMx AIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_ Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwI xGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWx JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcV C2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUULZ2DUUUUU== X-CM-SenderInfo: 5olkt0x0ld0ww6lv2u4olvutnvoduhdfq/1tbiBwoOE2lwF5s6LwAAsQ Content-Type: text/plain; charset="utf-8" In clkgen_c32_pll_setup(), `clk` is used for two distint variables' name. This patch rename the preceding `clk` to `pll_clk`. The rename is in preparation for cleaning up some memory leaks. Signed-off-by: Haoxiang Li Reviewed-by: Brian Masney --- drivers/clk/st/clkgen-pll.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/clk/st/clkgen-pll.c b/drivers/clk/st/clkgen-pll.c index a7d605b52cf3..24b9b66a83e1 100644 --- a/drivers/clk/st/clkgen-pll.c +++ b/drivers/clk/st/clkgen-pll.c @@ -755,11 +755,10 @@ static struct clk * __init clkgen_odf_register(const = char *parent_name, return clk; } =20 - static void __init clkgen_c32_pll_setup(struct device_node *np, struct clkgen_pll_data_clks *datac) { - struct clk *clk; + struct clk *pll_clk; const char *parent_name, *pll_name; void __iomem *pll_base; int num_odfs, odf; @@ -777,12 +776,12 @@ static void __init clkgen_c32_pll_setup(struct device= _node *np, =20 of_clk_detect_critical(np, 0, &pll_flags); =20 - clk =3D clkgen_pll_register(parent_name, datac->data, pll_base, pll_flags, + pll_clk =3D clkgen_pll_register(parent_name, datac->data, pll_base, pll_f= lags, np->name, datac->data->lock); - if (IS_ERR(clk)) + if (IS_ERR(pll_clk)) return; =20 - pll_name =3D __clk_get_name(clk); + pll_name =3D __clk_get_name(pll_clk); =20 num_odfs =3D datac->data->num_odfs; =20 @@ -831,6 +830,7 @@ static void __init clkgen_c32_pll_setup(struct device_n= ode *np, kfree(clk_data->clks); kfree(clk_data); } + static void __init clkgen_c32_pll0_setup(struct device_node *np) { clkgen_c32_pll_setup(np, --=20 2.25.1 From nobody Mon Feb 9 10:39:34 2026 Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C11C2E9EAA; Wed, 21 Jan 2026 01:22:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.84 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958572; cv=none; b=qe4qsCa5x63JsZqDrE1kxj0/87xhSSjJgOtTMoNwz98Pk6Y8ONKc6BNg7tjBcU4+SBOB/c592T45ZV9JjwgtX6tm29W1j7EGpozEs7HP9v8lM83fTLde8Bl+Q4kv47W5mFH6rYRi3IWmFTijvHtUAetcdvRsK4czsGYmxDtGVow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958572; c=relaxed/simple; bh=zuYueYRDsXSqHld17J0+XPoogomwbje9K2vKKSv3kV8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Yfqa19fByD4D2vAw0A9zo/fX4lSUkcDB4U2DI2eoJME1aNtMl0cCxy6dy46QvTCtYJsx+mzLfzcUns110nYGI/zypELnRh+EOwAqp84hDDqmfMlrRFmoh+YDTVmFl6qM6xs/2ZvVwklmUspx/XhdlRnuaDojm11HYkjimUObfno= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn; spf=pass smtp.mailfrom=isrc.iscas.ac.cn; arc=none smtp.client-ip=159.226.251.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isrc.iscas.ac.cn Received: from localhost.localdomain (unknown [36.112.3.108]) by APP-05 (Coremail) with SMTP id zQCowAB3zhFdKnBpw6_aBQ--.10840S5; Wed, 21 Jan 2026 09:22:43 +0800 (CST) From: Haoxiang Li To: mturquette@baylibre.com, sboyd@kernel.org, bmasney@redhat.com Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Haoxiang Li Subject: [PATCH v2 3/7] clk: st: clkgen-pll: Rename clk variable in clkgen_c32_pll_setup() Date: Wed, 21 Jan 2026 09:22:19 +0800 Message-Id: <20260121012223.186199-4-lihaoxiang@isrc.iscas.ac.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> References: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: zQCowAB3zhFdKnBpw6_aBQ--.10840S5 X-Coremail-Antispam: 1UD129KBjvJXoW7CrW5tF1rZFyUtr4fZryrJFb_yoW8Jw4Upa 4rA34av39rXrWvgFs5JrZ8WF90q3Z7KFy0krWDKwnYvwsxCry3Zw45u34293W8uryruF43 tr1jyr48uF1kJF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBl14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JrWl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1l84 ACjcxK6I8E87Iv67AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxkF7I0En4kS14v26r126r1DMx AIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_ Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwI xGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWx JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcV C2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUUtC7UUUUUU== X-CM-SenderInfo: 5olkt0x0ld0ww6lv2u4olvutnvoduhdfq/1tbiBwwOE2lwF5s6MQAAsI Content-Type: text/plain; charset="utf-8" In clkgen_c32_pll_setup(), `clk` is used for two distint variables' name. This patch rename the later `clk` to `odf_clk`. The rename is in preparation for cleaning up some memory leaks. Signed-off-by: Haoxiang Li Reviewed-by: Brian Masney --- drivers/clk/st/clkgen-pll.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/st/clkgen-pll.c b/drivers/clk/st/clkgen-pll.c index 24b9b66a83e1..566eb7e8a73c 100644 --- a/drivers/clk/st/clkgen-pll.c +++ b/drivers/clk/st/clkgen-pll.c @@ -797,7 +797,7 @@ static void __init clkgen_c32_pll_setup(struct device_n= ode *np, goto err; =20 for (odf =3D 0; odf < num_odfs; odf++) { - struct clk *clk; + struct clk *odf_clk; const char *clk_name; unsigned long odf_flags =3D 0; =20 @@ -813,13 +813,13 @@ static void __init clkgen_c32_pll_setup(struct device= _node *np, of_clk_detect_critical(np, odf, &odf_flags); } =20 - clk =3D clkgen_odf_register(pll_name, pll_base, datac->data, + odf_clk =3D clkgen_odf_register(pll_name, pll_base, datac->data, odf_flags, odf, &clkgena_c32_odf_lock, clk_name); - if (IS_ERR(clk)) + if (IS_ERR(odf_clk)) goto err; =20 - clk_data->clks[odf] =3D clk; + clk_data->clks[odf] =3D odf_clk; } =20 of_clk_add_provider(np, of_clk_src_onecell_get, clk_data); --=20 2.25.1 From nobody Mon Feb 9 10:39:34 2026 Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C1B2301708; Wed, 21 Jan 2026 01:22:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.84 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958573; cv=none; b=qMapjP6dBuhaFpee1sDR1iHUi3NjW1iU5Uxvy202VoU0M3EoLve5nWo6LFwKwXZoQKhgRfz1Kosing5XBUzNEfjlGyFBLOaikjDR12Zmbqa5y6dbcs2CUOZvEkkb7H4sQI15/FBk20LIi38QbB1YsLpYk0ByXWqfjLXfp28uxr0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958573; c=relaxed/simple; bh=DS2tK1t6AmzZjR/PdbhqUcKLzQg9yCjGLeA6JS8HGOc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LCEK2Ee4MNgW02tKb+FFOlkTnIl2tH7yuALgsxfIDJ/W40Bvf1/caZUY/oU9PiIKeXDcdJY0hTtTmgnlLYW02OQBVbwAJ5LxcOzVz7lGgj/oeLwBzAyJaFyihKhx7Ytuvimq2Ng056l2aY5ostJOezAU8jSBSLOnrs3mMixn3vo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn; spf=pass smtp.mailfrom=isrc.iscas.ac.cn; arc=none smtp.client-ip=159.226.251.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isrc.iscas.ac.cn Received: from localhost.localdomain (unknown [36.112.3.108]) by APP-05 (Coremail) with SMTP id zQCowAB3zhFdKnBpw6_aBQ--.10840S6; Wed, 21 Jan 2026 09:22:44 +0800 (CST) From: Haoxiang Li To: mturquette@baylibre.com, sboyd@kernel.org, bmasney@redhat.com Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Haoxiang Li , stable@vger.kernel.org Subject: [PATCH v2 4/7] clk: st: clkgen-pll: Add iounmap() in clkgen_c32_pll_setup() Date: Wed, 21 Jan 2026 09:22:20 +0800 Message-Id: <20260121012223.186199-5-lihaoxiang@isrc.iscas.ac.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> References: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: zQCowAB3zhFdKnBpw6_aBQ--.10840S6 X-Coremail-Antispam: 1UD129KBjvdXoWrZrWxXFyfuw15tw47WFW8tFb_yoWkKFbEv3 y8K34Sg345Cw1rCr4UWw4Sv34Fka1kuF1xWr1xtayfta45XryjkrWFvws3tr1SgFWfCFyD GwnrWrW3ur47JjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6kFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2 IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28E F7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJw A2z4x0Y4vEx4A2jsIE14v26r1j6r4UM28EF7xvwVC2z280aVCY1x0267AKxVW8JVW8Jr1l e2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI 8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwAC jcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc7CjxVAaw2AFwI0_JF0_Jw 1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWU JVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7V AKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42 IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUYcTQUUUUU X-CM-SenderInfo: 5olkt0x0ld0ww6lv2u4olvutnvoduhdfq/1tbiBgoOE2lwF2I7VwAAsR Content-Type: text/plain; charset="utf-8" Add a iounmap() to release the memory allocated by clkgen_get_register_base() in error path. Fixes: b9b8e614b580 ("clk: st: Support for PLLs inside ClockGenA(s)") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Reviewed-by: Brian Masney --- drivers/clk/st/clkgen-pll.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/clk/st/clkgen-pll.c b/drivers/clk/st/clkgen-pll.c index 566eb7e8a73c..073180754a56 100644 --- a/drivers/clk/st/clkgen-pll.c +++ b/drivers/clk/st/clkgen-pll.c @@ -779,7 +779,7 @@ static void __init clkgen_c32_pll_setup(struct device_n= ode *np, pll_clk =3D clkgen_pll_register(parent_name, datac->data, pll_base, pll_f= lags, np->name, datac->data->lock); if (IS_ERR(pll_clk)) - return; + goto err_unmap; =20 pll_name =3D __clk_get_name(pll_clk); =20 @@ -829,6 +829,9 @@ static void __init clkgen_c32_pll_setup(struct device_n= ode *np, kfree(pll_name); kfree(clk_data->clks); kfree(clk_data); +err_unmap: + if (pll_base) + iounmap(pll_base); } =20 static void __init clkgen_c32_pll0_setup(struct device_node *np) --=20 2.25.1 From nobody Mon Feb 9 10:39:34 2026 Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 370B72DEA97; Wed, 21 Jan 2026 01:22:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.84 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958573; cv=none; b=di0YsL6PJUjq25AkfF5KopJQwfOj0A+44P7dWYMO2zjkKZOUfrB2NynTD2EN/1EWjjwI9/WD6HDzI8J2US1hSOMUMXzPGW3tMM4dil0JggCya4AMWS7jk1qgRd2CTPq2gts1ZI9Aj3LB3GVXucikFKjlPJ8ittf9kEh8e3DHE6c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958573; c=relaxed/simple; bh=qcBzSlikjwgktBRFNfiEhXzWSxLomGgatXcz6Y27nsM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pKsXPifXojUjE14pHPhGB1dxIYyV+ESWYRbJCu0EP6odGAEkDH76nm6yGBlKprnwJopvEO8dVseo0C+RlyELjKpswFZyoJgZ5jRB9+E7CFHcNOGOgncd7usj5ab78kdHqEVUoSWOOgSDl2y6ueOAUZ/JPohYy7rCD8xS8NOItR8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn; spf=pass smtp.mailfrom=isrc.iscas.ac.cn; arc=none smtp.client-ip=159.226.251.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isrc.iscas.ac.cn Received: from localhost.localdomain (unknown [36.112.3.108]) by APP-05 (Coremail) with SMTP id zQCowAB3zhFdKnBpw6_aBQ--.10840S7; Wed, 21 Jan 2026 09:22:46 +0800 (CST) From: Haoxiang Li To: mturquette@baylibre.com, sboyd@kernel.org, bmasney@redhat.com Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Haoxiang Li , stable@vger.kernel.org Subject: [PATCH v2 5/7] clk: st: clkgen-pll: Add clk_unregister for pll_clk in clkgen_c32_pll_setup() Date: Wed, 21 Jan 2026 09:22:21 +0800 Message-Id: <20260121012223.186199-6-lihaoxiang@isrc.iscas.ac.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> References: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: zQCowAB3zhFdKnBpw6_aBQ--.10840S7 X-Coremail-Antispam: 1UD129KBjvJXoW7Cr18tw1UAFW5tFW8JF1xGrg_yoW8WrWfpa yrGw1Yy34DXr4vqF48JFWDuas8Wan2gFW7CFW7Cwn5uwsxtry5Jw4Ygas293WUA3yxuF4a qr1q9r40vF4UAF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBK14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr 1l84ACjcxK6I8E87Iv67AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1U M2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjx v20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1l F7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxkF7I0En4kS14v26r126r 1DMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbx9NDUUUUU= = X-CM-SenderInfo: 5olkt0x0ld0ww6lv2u4olvutnvoduhdfq/1tbiBwkOE2lwF5s6OwAAsH Content-Type: text/plain; charset="utf-8" In clkgen_c32_pll_setup(), clkgen_pll_register() allocated a clkgen_pll memory and registered a clk. Add clk_unregister() and kfree() to release the memory if error occurs. Fixes: b9b8e614b580 ("clk: st: Support for PLLs inside ClockGenA(s)") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Reviewed-by: Brian Masney --- drivers/clk/st/clkgen-pll.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/clk/st/clkgen-pll.c b/drivers/clk/st/clkgen-pll.c index 073180754a56..ddf7673a52c5 100644 --- a/drivers/clk/st/clkgen-pll.c +++ b/drivers/clk/st/clkgen-pll.c @@ -764,7 +764,7 @@ static void __init clkgen_c32_pll_setup(struct device_n= ode *np, int num_odfs, odf; struct clk_onecell_data *clk_data; unsigned long pll_flags =3D 0; - + struct clkgen_pll *pll; =20 parent_name =3D of_clk_get_parent_name(np, 0); if (!parent_name) @@ -787,7 +787,7 @@ static void __init clkgen_c32_pll_setup(struct device_n= ode *np, =20 clk_data =3D kzalloc(sizeof(*clk_data), GFP_KERNEL); if (!clk_data) - return; + goto err_pll_unregister; =20 clk_data->clk_num =3D num_odfs; clk_data->clks =3D kcalloc(clk_data->clk_num, sizeof(struct clk *), @@ -829,6 +829,10 @@ static void __init clkgen_c32_pll_setup(struct device_= node *np, kfree(pll_name); kfree(clk_data->clks); kfree(clk_data); +err_pll_unregister: + pll =3D to_clkgen_pll(__clk_get_hw(pll_clk)); + clk_unregister(pll_clk); + kfree(pll); err_unmap: if (pll_base) iounmap(pll_base); --=20 2.25.1 From nobody Mon Feb 9 10:39:34 2026 Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DCAC2305E1F; Wed, 21 Jan 2026 01:22:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.84 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958578; cv=none; b=keFPM906xP2AzZYgn90pqT0ilXyt4Gcs8SYTxrWVVWgFMAmkUEkzEBGvTT1piV5rfN/bnE9Rm2p+PVKK9i8ua+LmEm1VPZQtjJghLRSn1RF65mRq21MmDrznfiZg5N8VpQGE/A7QIi0OXTMArhq6yMJNyxsLOE1h96W5amtidZM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958578; c=relaxed/simple; bh=MdrePG750UHfgpHeOHFuXkLgHmgPmb17/7/xTpwzhAE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e+/3Q05mmfzVg0Rk8tMakC41KW+lXMZWO8XRC3P+ltekf2i4ToxmU58r4B7NIcKbtbkye3e2Pqn/Bu1cOGFYAS5kwTHIWtzovMFp3pfVmnBiANXHVAU/wNds6ucip/hGAyIBqv1oEZSaGE/ZmBkwdW1u7t81ihWdV5uyYbrPcrM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn; spf=pass smtp.mailfrom=isrc.iscas.ac.cn; arc=none smtp.client-ip=159.226.251.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isrc.iscas.ac.cn Received: from localhost.localdomain (unknown [36.112.3.108]) by APP-05 (Coremail) with SMTP id zQCowAB3zhFdKnBpw6_aBQ--.10840S8; Wed, 21 Jan 2026 09:22:46 +0800 (CST) From: Haoxiang Li To: mturquette@baylibre.com, sboyd@kernel.org, bmasney@redhat.com Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Haoxiang Li , stable@vger.kernel.org Subject: [PATCH v2 6/7] clk: st: clkgen-pll: Remove redundant kfree() in clkgen_c32_pll_setup() Date: Wed, 21 Jan 2026 09:22:22 +0800 Message-Id: <20260121012223.186199-7-lihaoxiang@isrc.iscas.ac.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> References: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: zQCowAB3zhFdKnBpw6_aBQ--.10840S8 X-Coremail-Antispam: 1UD129KBjvdXoWrKr4ruF1DtF1Uuryktw13urg_yoWftFbEkF WIy34Ivw1rCr4UAw1Uua1fZ34F93Z5ZFn3WFn3t3y3t34UXFyUKryFqws3Jw13XFWfCF1D Gw1fJr4Uur47AjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6kFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2 IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28E F7xvwVC0I7IYx2IY67AKxVWUCVW8JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJw A2z4x0Y4vEx4A2jsIE14v26r1j6r4UM28EF7xvwVC2z280aVCY1x0267AKxVW8JVW8Jr1l e2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI 8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwAC jcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc7CjxVAaw2AFwI0_JF0_Jw 1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWU JVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7V AKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42 IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUYcTQUUUUU X-CM-SenderInfo: 5olkt0x0ld0ww6lv2u4olvutnvoduhdfq/1tbiBwwOE2lwF5s6PAABsE Content-Type: text/plain; charset="utf-8" In clkgen_c32_pll_setup(), pll_name is actually pll_clk -> core->name. This variable will be released in clk_unregister() -> __clk_release() if some error occurs. Thus kfree(pll_name) will cause a double free. Remove this redundant kfree(). Fixes: b9b8e614b580 ("clk: st: Support for PLLs inside ClockGenA(s)") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Reviewed-by: Brian Masney --- drivers/clk/st/clkgen-pll.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/clk/st/clkgen-pll.c b/drivers/clk/st/clkgen-pll.c index ddf7673a52c5..b8d2b97a6b9b 100644 --- a/drivers/clk/st/clkgen-pll.c +++ b/drivers/clk/st/clkgen-pll.c @@ -826,7 +826,6 @@ static void __init clkgen_c32_pll_setup(struct device_n= ode *np, return; =20 err: - kfree(pll_name); kfree(clk_data->clks); kfree(clk_data); err_pll_unregister: --=20 2.25.1 From nobody Mon Feb 9 10:39:34 2026 Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 210BF306D36; Wed, 21 Jan 2026 01:22:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.84 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958576; cv=none; b=dBGbF4HZU6Gakou9jFRBSr4/nwsCjh2SVDIv2FjvPCV9VWkbhfq4IWYUkG7908xOEZ5ZPKKUAWLUVOYtbZNlQ54mmqmuUyQIkEhQriRVFnXku94MNXPVoRH+/GCU29d08bvlGbVWdWcaXC8cmthRamwO7ZLy6U/xzcpcYj31mvM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958576; c=relaxed/simple; bh=XCreuTY5gY2H4bs7NLVdbgcmDhbqvNA3rPMEgN0F6Ck=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sFp8XcJ2X7mSu0iQOw4xwzxFLa+bbYqfZqSSm0TetsK9ks5ooKI8cJz1RQcPPIPHpBMmhAyI5K/+jfr4RKYrTgnrEoPSOXWdWooeTARRG61HzwmVH3MxyszJhFRqHCZtdU5KB/gXPZh7KucBXtxx63LzXJ9E93LZVRGdMABACsI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn; spf=pass smtp.mailfrom=isrc.iscas.ac.cn; arc=none smtp.client-ip=159.226.251.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isrc.iscas.ac.cn Received: from localhost.localdomain (unknown [36.112.3.108]) by APP-05 (Coremail) with SMTP id zQCowAB3zhFdKnBpw6_aBQ--.10840S9; Wed, 21 Jan 2026 09:22:47 +0800 (CST) From: Haoxiang Li To: mturquette@baylibre.com, sboyd@kernel.org, bmasney@redhat.com Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Haoxiang Li , stable@vger.kernel.org Subject: [PATCH v2 7/7] clk: st: clkgen-pll: Add clk_unregister for odf_clk in clkgen_c32_pll_setup() Date: Wed, 21 Jan 2026 09:22:23 +0800 Message-Id: <20260121012223.186199-8-lihaoxiang@isrc.iscas.ac.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> References: <20260121012223.186199-1-lihaoxiang@isrc.iscas.ac.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: zQCowAB3zhFdKnBpw6_aBQ--.10840S9 X-Coremail-Antispam: 1UD129KBjvJXoW7Ar48Ar1ktF4fJr1kJw4UCFg_yoW8tryUp3 WrG34Yya4kXF4kWFs3Jr4q9F98G3Z29FW7urWYywn5Zw43Jry5Jw4Y934I93W5Cry8uw42 qr4q9r48uF48tF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPj14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr 1UM28EF7xvwVC2z280aVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4j6r4U JwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY1x0262kKe7AKxVWUAV WUtwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8Jw CI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUYcTQUUUU U X-CM-SenderInfo: 5olkt0x0ld0ww6lv2u4olvutnvoduhdfq/1tbiBwwOE2lwF5s6QwAAs6 Content-Type: text/plain; charset="utf-8" In clkgen_c32_pll_setup(), clkgen_odf_register() allocated clk_gate and clk_divider memory and registered a clk. Add clk_unregister() and kfree() to release the memory if error occurs. Initialize odf to zero for safe. Fixes: b9b8e614b580 ("clk: st: Support for PLLs inside ClockGenA(s)") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Reviewed-by: Brian Masney --- drivers/clk/st/clkgen-pll.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/clk/st/clkgen-pll.c b/drivers/clk/st/clkgen-pll.c index b8d2b97a6b9b..3fc0af4b77c6 100644 --- a/drivers/clk/st/clkgen-pll.c +++ b/drivers/clk/st/clkgen-pll.c @@ -761,10 +761,12 @@ static void __init clkgen_c32_pll_setup(struct device= _node *np, struct clk *pll_clk; const char *parent_name, *pll_name; void __iomem *pll_base; - int num_odfs, odf; + int num_odfs, odf =3D 0; struct clk_onecell_data *clk_data; unsigned long pll_flags =3D 0; struct clkgen_pll *pll; + struct clk_gate *gate; + struct clk_divider *div; =20 parent_name =3D of_clk_get_parent_name(np, 0); if (!parent_name) @@ -808,7 +810,7 @@ static void __init clkgen_c32_pll_setup(struct device_n= ode *np, if (of_property_read_string_index(np, "clock-output-names", odf, &clk_name)) - return; + goto err_odf_unregister; =20 of_clk_detect_critical(np, odf, &odf_flags); } @@ -817,7 +819,7 @@ static void __init clkgen_c32_pll_setup(struct device_n= ode *np, odf_flags, odf, &clkgena_c32_odf_lock, clk_name); if (IS_ERR(odf_clk)) - goto err; + goto err_odf_unregister; =20 clk_data->clks[odf] =3D odf_clk; } @@ -825,6 +827,14 @@ static void __init clkgen_c32_pll_setup(struct device_= node *np, of_clk_add_provider(np, of_clk_src_onecell_get, clk_data); return; =20 +err_odf_unregister: + while (--odf >=3D 0) { + gate =3D to_clk_gate(__clk_get_hw(clk_data->clks[odf])); + div =3D to_clk_divider(__clk_get_hw(clk_data->clks[odf])); + clk_unregister_composite(clk_data->clks[odf]); + kfree(div); + kfree(gate); + } err: kfree(clk_data->clks); kfree(clk_data); --=20 2.25.1