]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
clk: ti: dra7-atl-clock: Fix possible ERR_PTR dereference
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>
Wed, 13 May 2015 06:54:40 +0000 (15:54 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Aug 2015 16:29:17 +0000 (09:29 -0700)
commit e0cdcda508f110b7ec190dc7c5eb2869ba73a535 upstream.

of_clk_get_from_provider() returns ERR_PTR on failure. The
dra7-atl-clock driver was not checking its return value and
immediately used it in __clk_get_hw().  __clk_get_hw()
dereferences supplied clock, if it is not NULL, so in that case
it would dereference an ERR_PTR.

Fixes: 9ac33b0ce81f ("CLK: TI: Driver for DRA7 ATL (Audio Tracking Logic)")
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/clk/ti/clk-dra7-atl.c

index d86bc46b93bdfeae630f94a55745315a0d8c1ec8..0a1df821860fdc01ed9dc2278111b1b4150ed62b 100644 (file)
@@ -252,6 +252,11 @@ static int of_dra7_atl_clk_probe(struct platform_device *pdev)
                }
 
                clk = of_clk_get_from_provider(&clkspec);
+               if (IS_ERR(clk)) {
+                       pr_err("%s: failed to get atl clock %d from provider\n",
+                              __func__, i);
+                       return PTR_ERR(clk);
+               }
 
                cdesc = to_atl_desc(__clk_get_hw(clk));
                cdesc->cinfo = cinfo;