Skip to content

Commit 21b8a1d

Browse files
keesalexandrebelloni
authored andcommitted
rtc: msc313: Fix function prototype mismatch in msc313_rtc_probe()
With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. msc313_rtc_probe() was passing clk_disable_unprepare() directly, which did not have matching prototypes for devm_add_action_or_reset()'s callback argument. Refactor to use devm_clk_get_enabled() instead. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <[email protected]> Link: https://lore.kernel.org/lkml/[email protected] Suggested-by: Christophe JAILLET <[email protected]> Cc: Daniel Palmer <[email protected]> Cc: Romain Perier <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Alexandre Belloni <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Kees Cook <[email protected]> Reviewed-by: Daniel Palmer <[email protected]> Tested-by: Daniel Palmer <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexandre Belloni <[email protected]>
1 parent 800b55b commit 21b8a1d

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

drivers/rtc/rtc-msc313.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -212,22 +212,12 @@ static int msc313_rtc_probe(struct platform_device *pdev)
212212
return ret;
213213
}
214214

215-
clk = devm_clk_get(dev, NULL);
215+
clk = devm_clk_get_enabled(dev, NULL);
216216
if (IS_ERR(clk)) {
217217
dev_err(dev, "No input reference clock\n");
218218
return PTR_ERR(clk);
219219
}
220220

221-
ret = clk_prepare_enable(clk);
222-
if (ret) {
223-
dev_err(dev, "Failed to enable the reference clock, %d\n", ret);
224-
return ret;
225-
}
226-
227-
ret = devm_add_action_or_reset(dev, (void (*) (void *))clk_disable_unprepare, clk);
228-
if (ret)
229-
return ret;
230-
231221
rate = clk_get_rate(clk);
232222
writew(rate & 0xFFFF, priv->rtc_base + REG_RTC_FREQ_CW_L);
233223
writew((rate >> 16) & 0xFFFF, priv->rtc_base + REG_RTC_FREQ_CW_H);

0 commit comments

Comments
 (0)