qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rtc: msc313: Fix function prototype mismatch in msc313_rtc_probe() 

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2183349

commit 21b8a1dd56a163825e5749b303858fb902ebf198
Author: Kees Cook <keescook@chromium.org>
Date:   Fri Dec 2 10:45:30 2022 -0800

    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 <lkp@intel.com>
    Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com
    Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Cc: Daniel Palmer <daniel@thingy.jp>
    Cc: Romain Perier <romain.perier@gmail.com>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: linux-rtc@vger.kernel.org
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Reviewed-by: Daniel Palmer <daniel@thingy.jp>
    Tested-by: Daniel Palmer <daniel@thingy.jp>
    Link: https://lore.kernel.org/r/20221202184525.gonna.423-kees@kernel.org
    Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
    (cherry picked from commit 21b8a1dd56a163825e5749b303858fb902ebf198)

Signed-off-by: Gavin Shan <gshan@redhat.com>
This commit is contained in:
Gavin Shan 2023-05-30 13:35:10 +10:00
parent 952cc791a7
commit ec5f49cca7
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/rtc/rtc-msc313.c
View File

@ -212,22 +212,12 @@ static int msc313_rtc_probe(struct platform_device *pdev)
return ret;
}
clk = devm_clk_get(dev, NULL);
clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(clk)) {
dev_err(dev, "No input reference clock\n");
return PTR_ERR(clk);
}
ret = clk_prepare_enable(clk);
if (ret) {
dev_err(dev, "Failed to enable the reference clock, %d\n", ret);
return ret;
}
ret = devm_add_action_or_reset(dev, (void (*) (void *))clk_disable_unprepare, clk);
if (ret)
return ret;
rate = clk_get_rate(clk);
writew(rate & 0xFFFF, priv->rtc_base + REG_RTC_FREQ_CW_L);
writew((rate >> 16) & 0xFFFF, priv->rtc_base + REG_RTC_FREQ_CW_H);