ARM: omap2+: hwmod: fix potential NULL pointer access
Subsystems (4)
Kevin Hilman
maintainerPATCH 1/1 ARM: omap2+: hwmod: fix potential NULL pointer access
From: Tero Kristo <[email protected]>
omap_hwmod_get_pwrdm() may access a NULL clk_hw pointer in some failure cases. Add a check for the case and bail out gracely if this happens.
Reported-by Dan Murphy <[email protected]>
Signed-off-by Tero Kristo <[email protected]>
Cc [email protected] # v5.10+
Signed-off-by Kevin Hilman <[email protected]>
--- arch/arm/mach-omap2/omap_hwmod.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod.c +9 -1
@@ -3776,6 +3776,7 @@ struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh)struct omap_hwmod_ocp_if *oi;struct clockdomain *clkdm;struct clk_hw_omap *clk; +struct clk_hw *hw;if (!oh)return NULL ;
@@ -3792,7 +3793,14 @@ struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh) c = oi->_clk; } - clk =to_clk_hw_omap (__clk_get_hw (c)); + hw =__clk_get_hw (c); +if (!hw) +return NULL ; + + clk =to_clk_hw_omap (hw); +if (!clk) +return NULL ; + clkdm = clk->clkdm;if (!clkdm)return NULL ;
Signature · 1 line
2.31.1
Tony Lindgren
maintainerQuoted 4 lines · Kevin Hilman
From: Tero Kristo <[email protected]>
omap_hwmod_get_pwrdm()may access a NULLclk_hwpointer in some failure cases. Add a check for the case and bail out gracely if this happens.
Applying into fixes thanks.
Tony