Skip to content

Commit

Permalink
ARM: omap2+: hwmod: fix potential NULL pointer access
Browse files Browse the repository at this point in the history
commit b070f9c upstream.

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 <dmurphy@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Cc: stable@vger.kernel.org # v5.10+
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Tero Kristo authored and gregkh committed Aug 12, 2021
1 parent 9851ad2 commit 3d7d2d2
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion arch/arm/mach-omap2/omap_hwmod.c
Expand Up @@ -3777,6 +3777,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;
Expand All @@ -3793,7 +3794,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;
Expand Down

0 comments on commit 3d7d2d2

Please sign in to comment.