diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-05-13 15:54:40 +0900 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2015-07-15 10:01:15 +0100 |
commit | 15fca9961b884c5d9012aed934d0a3647173c85d (patch) | |
tree | 352f7b94a4b35825c243ec0412ec56c76e7d5be2 /drivers/clk | |
parent | 32cb5764580ee85cf3d294f013849de2f47dd69f (diff) | |
download | linux-stable-15fca9961b884c5d9012aed934d0a3647173c85d.tar.gz linux-stable-15fca9961b884c5d9012aed934d0a3647173c85d.tar.bz2 linux-stable-15fca9961b884c5d9012aed934d0a3647173c85d.zip |
clk: ti: dra7-atl-clock: Fix possible ERR_PTR dereference
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: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/ti/clk-dra7-atl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/clk/ti/clk-dra7-atl.c b/drivers/clk/ti/clk-dra7-atl.c index af29359677da..d1db76887b8b 100644 --- a/drivers/clk/ti/clk-dra7-atl.c +++ b/drivers/clk/ti/clk-dra7-atl.c @@ -250,6 +250,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; |