lkml.org 
[lkml]   [2015]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 150/185] clk: ti: dra7-atl-clock: Fix possible ERR_PTR dereference
    Date
    3.16.7-ckt15 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Krzysztof Kozlowski <k.kozlowski@samsung.com>

    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>
    ---
    drivers/clk/ti/clk-dra7-atl.c | 5 +++++
    1 file changed, 5 insertions(+)

    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;

    \
     
     \ /
      Last update: 2015-07-15 11:41    [W:5.082 / U:0.424 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site