From: Changhuang Liang changhuang.liang@starfivetech.com

mainline inclusion from mainline-v6.12-rc4 commit 2cf59663660799ce16f4dfbed97cdceac7a7fa11 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB2BXH CVE: CVE-2024-50137

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...

--------------------------------

data->asserted will be NULL on JH7110 SoC since commit 82327b127d41 ("reset: starfive: Add StarFive JH7110 reset driver") was added. Add the judgment condition to avoid errors when calling reset_control_status on JH7110 SoC.

Fixes: 82327b127d41 ("reset: starfive: Add StarFive JH7110 reset driver") Signed-off-by: Changhuang Liang changhuang.liang@starfivetech.com Acked-by: Hal Feng hal.feng@starfivetech.com Reviewed-by: Philipp Zabel p.zabel@pengutronix.de Link: https://lore.kernel.org/r/20240925112442.1732416-1-changhuang.liang@starfive... Signed-off-by: Philipp Zabel p.zabel@pengutronix.de Signed-off-by: Zeng Heng zengheng4@huawei.com --- drivers/reset/starfive/reset-starfive-jh71x0.c | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/drivers/reset/starfive/reset-starfive-jh71x0.c b/drivers/reset/starfive/reset-starfive-jh71x0.c index 55bbbd2de52c..29ce3486752f 100644 --- a/drivers/reset/starfive/reset-starfive-jh71x0.c +++ b/drivers/reset/starfive/reset-starfive-jh71x0.c @@ -94,6 +94,9 @@ static int jh71x0_reset_status(struct reset_controller_dev *rcdev, void __iomem *reg_status = data->status + offset * sizeof(u32); u32 value = readl(reg_status);

+ if (!data->asserted) + return !(value & mask); + return !((value ^ data->asserted[offset]) & mask); }