| 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
| ||
|
Date: Tue, 11 Jan 2022 13:10:21 +0800
From: Zhou Qingyang <zhou1615@....edu>
To: zhou1615@....edu
Cc: kjlu@....edu, Michael Turquette <mturquette@...libre.com>,
Stephen Boyd <sboyd@...nel.org>,
Mario Limonciello <Mario.Limonciello@....com>,
Ajit Kumar Pandey <AjitKumar.Pandey@....com>,
"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>,
Akshu Agrawal <akshu.agrawal@....com>,
linux-clk@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH v3] clk: x86: Fix a wild pointer dereference in fch_clk_probe()
In fch_clk_probe(), the return value of clk_hw_register_mux() is
assigned to hws[ST_CLK_MUX] and there is a dereference of it in
fch_clk_probe(), which could lead to a wild pointer dereference on
failure of clk_hw_register_mux().
Fix this bug by adding a check of hws[ST_CLK_MUX].
This bug was found by a static analyzer.
Builds with CONFIG_X86_AMD_PLATFORM_DEVICE=y show no new warnings, and
our static analyzer no longer warns about this code.
Fixes: 19fe87fd854a ("clk: x86: Support RV architecture")
Signed-off-by: Zhou Qingyang <zhou1615@....edu>
---
The analysis employs differential checking to identify inconsistent
security operations (e.g., checks or kfrees) between two code paths
and confirms that the inconsistent operations are not recovered in
the current function or the callers, so they constitute bugs.
Note that, as a bug found by static analysis, it can be a false
positive or hard to trigger. Multiple researchers have cross-reviewed
the bug.
Changes in v3:
- Rebase this based on clk-next.
Changes in v2:
- Add error check to every register function calls.
- Add error handling logic to every error path.
- Turn clk_hw_register_mux to devm_clk_hw_register_mux.
- Add error check of clk_set_parent().
drivers/clk/x86/clk-fch.c | 69 ++++++++++++++++++++++++++++++++++-----
1 file changed, 61 insertions(+), 8 deletions(-)
diff --git a/drivers/clk/x86/clk-fch.c b/drivers/clk/x86/clk-fch.c
index fdc060e75839..bb0ed6b2a126 100644
--- a/drivers/clk/x86/clk-fch.c
+++ b/drivers/clk/x86/clk-fch.c
@@ -46,6 +46,7 @@ static int fch_clk_probe(struct platform_device *pdev)
{
struct fch_clk_data *fch_data;
struct pci_dev *rdev;
+ int ret;
fch_data = dev_get_platdata(&pdev->dev);
if (!fch_data || !fch_data->base)
@@ -60,36 +61,88 @@ static int fch_clk_probe(struct platform_device *pdev)
if (pci_match_id(fch_pci_ids, rdev)) {
hws[ST_CLK_48M] = clk_hw_register_fixed_rate(NULL, "clk48MHz",
NULL, 0, 48000000);
+ if (IS_ERR(hws[ST_CLK_48M])) {
+ ret = PTR_ERR(hws[ST_CLK_48M]);
+ goto err_st_clk_48m;
+ }
+
hws[ST_CLK_25M] = clk_hw_register_fixed_rate(NULL, "clk25MHz",
NULL, 0, 25000000);
+ if (IS_ERR(hws[ST_CLK_25M])) {
+ ret = PTR_ERR(hws[ST_CLK_25M]);
+ goto err_st_clk_25m;
+ }
- hws[ST_CLK_MUX] = clk_hw_register_mux(NULL, "oscout1_mux",
+ hws[ST_CLK_MUX] = devm_clk_hw_register_mux(NULL, "oscout1_mux",
clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents),
0, fch_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0,
NULL);
+ if (IS_ERR(hws[ST_CLK_MUX])) {
+ ret = PTR_ERR(hws[ST_CLK_MUX]);
+ goto err_st_clk_mux;
+ }
- clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk);
+ ret = clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk);
+ if (ret)
+ goto err_clk_set_parent;
hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1",
"oscout1_mux", 0, fch_data->base + MISCCLKCNTL1,
OSCCLKENB, CLK_GATE_SET_TO_DISABLE, NULL);
-
- devm_clk_hw_register_clkdev(&pdev->dev, hws[ST_CLK_GATE],
- fch_data->name, NULL);
+ if (IS_ERR(hws[ST_CLK_GATE])) {
+ ret = PTR_ERR(hws[ST_CLK_GATE]);
+ goto err_st_clk_gate;
+ }
+
+ ret = devm_clk_hw_register_clkdev(&pdev->dev, hws[ST_CLK_GATE],
+ fch_data->name, NULL);
+ if (ret)
+ goto err_register_st_clk_gate;
} else {
hws[CLK_48M_FIXED] = clk_hw_register_fixed_rate(NULL, "clk48MHz",
NULL, 0, 48000000);
+ if (IS_ERR(hws[CLK_48M_FIXED])) {
+ ret = PTR_ERR(hws[CLK_48M_FIXED]);
+ goto err_clk_48m_fixed;
+ }
hws[CLK_GATE_FIXED] = clk_hw_register_gate(NULL, "oscout1",
"clk48MHz", 0, fch_data->base + MISCCLKCNTL1,
OSCCLKENB, 0, NULL);
-
- devm_clk_hw_register_clkdev(&pdev->dev, hws[CLK_GATE_FIXED],
- fch_data->name, NULL);
+ if (IS_ERR(hws[CLK_GATE_FIXED])) {
+ ret = PTR_ERR(hws[CLK_GATE_FIXED]);
+ goto err_clk_gate_fixed;
+ }
+
+ ret = devm_clk_hw_register_clkdev(&pdev->dev, hws[CLK_GATE_FIXED],
+ fch_data->name, NULL);
+ if (ret)
+ goto err_register_gate_fixed;
}
pci_dev_put(rdev);
return 0;
+
+err_register_st_clk_gate:
+ clk_hw_unregister_gate(hws[ST_CLK_GATE]);
+err_st_clk_gate:
+err_clk_set_parent:
+ clk_hw_unregister_mux(hws[ST_CLK_MUX]);
+err_st_clk_mux:
+ clk_hw_unregister_fixed_rate(hws[ST_CLK_25M]);
+err_st_clk_25m:
+ clk_hw_unregister_fixed_rate(hws[ST_CLK_48M]);
+err_st_clk_48m:
+ pci_dev_put(rdev);
+ return ret;
+
+err_register_gate_fixed:
+ clk_hw_unregister_gate(hws[CLK_GATE_FIXED]);
+err_clk_gate_fixed:
+ clk_hw_unregister_fixed_rate(hws[CLK_48M_FIXED]);
+err_clk_48m_fixed:
+ pci_dev_put(rdev);
+ return ret;
}
static int fch_clk_remove(struct platform_device *pdev)
--
2.25.1
Powered by blists - more mailing lists