linux-kernel - [PATCH v2] clk: clk-st: Add missed return value checks in st_clk

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:   Sat,  6 Jun 2020 00:14:30 +0800
From:   Chuhong Yuan <hslester96@...il.com>
To:     unlisted-recipients:; (no To-header on input)
Cc:     Michael Turquette <mturquette@...libre.com>,
        Stephen Boyd <sboyd@...nel.org>,
        Markus Elfring <Markus.Elfring@....de>,
        Akshu Agrawal <Akshu.Agrawal@....com>,
        "Rafael J . Wysocki" <rafael.j.wysocki@...el.com>,
        Daniel Kurtz <djkurtz@...omium.org>, linux-clk@...r.kernel.org,
        linux-kernel@...r.kernel.org, Chuhong Yuan <hslester96@...il.com>
Subject: [PATCH v2] clk: clk-st: Add missed return value checks in st_clk_probe()

Return values were not checked after calls of the following functions.
  - clk_hw_register_mux
  - clk_hw_register_gate
  - devm_clk_hw_register_clkdev

Thus add error detection and the corresponding exception handling.

Return the value from the function call "devm_clk_hw_register_clkdev"
at the end of this function implementation.

Fixes: 421bf6a1f061 ("clk: x86: Add ST oscout platform clock")
Signed-off-by: Chuhong Yuan <hslester96@...il.com>
---
Changes in v2:
  - Modify description.

 drivers/clk/x86/clk-st.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/x86/clk-st.c b/drivers/clk/x86/clk-st.c
index 25d4b97aff9b..e6ee6ea2568b 100644
--- a/drivers/clk/x86/clk-st.c
+++ b/drivers/clk/x86/clk-st.c
@@ -46,16 +46,20 @@ static int st_clk_probe(struct platform_device *pdev)
 		clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents),
 		0, st_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL);
 
+	if (IS_ERR(hws[ST_CLK_MUX]))
+		return PTR_ERR(hws[ST_CLK_MUX]);
+
 	clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk);
 
 	hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", "oscout1_mux",
 		0, st_data->base + MISCCLKCNTL1, OSCCLKENB,
 		CLK_GATE_SET_TO_DISABLE, NULL);
 
-	devm_clk_hw_register_clkdev(&pdev->dev, hws[ST_CLK_GATE], "oscout1",
-				    NULL);
+	if (IS_ERR(hws[ST_CLK_GATE]))
+		return PTR_ERR(hws[ST_CLK_GATE]);
 
-	return 0;
+	return devm_clk_hw_register_clkdev(&pdev->dev, hws[ST_CLK_GATE],
+					   "oscout1", NULL);
 }
 
 static int st_clk_remove(struct platform_device *pdev)
-- 
2.26.2