From: Devendra Naga Date: Sat, 29 Nov 2014 22:48:34 +0000 (-0500) Subject: staging: clocking-wizard: check for a valid clk_name pointer X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5f18611038f9c9d503318490069b730c942523f8;p=linux-beck.git staging: clocking-wizard: check for a valid clk_name pointer The clk_name gets the return value from kasprintf (part of which does the allocation of the returned buffer). So check the return pointer before using it for clk_register_fixed_factor. Signed-off-by: Devendra Naga Reviewed-by: Soren Brinkmann Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c b/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c index 7202d8e889aa..0a3a8fe67fb5 100644 --- a/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c +++ b/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c @@ -221,6 +221,11 @@ static int clk_wzrd_probe(struct platform_device *pdev) reg = (readl(clk_wzrd->base + WZRD_CLK_CFG_REG(0)) & WZRD_DIVCLK_DIVIDE_MASK) >> WZRD_DIVCLK_DIVIDE_SHIFT; clk_name = kasprintf(GFP_KERNEL, "%s_mul_div", dev_name(&pdev->dev)); + if (!clk_name) { + ret = -ENOMEM; + goto err_rm_int_clk; + } + clk_wzrd->clks_internal[wzrd_clk_mul_div] = clk_register_fixed_factor( &pdev->dev, clk_name, __clk_get_name(clk_wzrd->clks_internal[wzrd_clk_mul]),