Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: meson-mx-sdio: check devm_kasprintf for failure

devm_kasprintf() may return NULL on failure of internal allocation thus
the assignments to init.name are not safe if not checked. On error
meson_mx_mmc_register_clks() returns negative values so -ENOMEM in the
(unlikely) failure case of devm_kasprintf() should be fine here.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Fixes: ed80a13bb4c4 ("mmc: meson-mx-sdio: Add a driver for the Amlogic Meson8 and Meson8b SoCs")
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Nicholas Mc Guire and committed by
Ulf Hansson
b0d06f1c 48e304cc

+6
+6
drivers/mmc/host/meson-mx-sdio.c
··· 596 596 init.name = devm_kasprintf(host->controller_dev, GFP_KERNEL, 597 597 "%s#fixed_factor", 598 598 dev_name(host->controller_dev)); 599 + if (!init.name) 600 + return -ENOMEM; 601 + 599 602 init.ops = &clk_fixed_factor_ops; 600 603 init.flags = 0; 601 604 init.parent_names = &clk_fixed_factor_parent; ··· 615 612 clk_div_parent = __clk_get_name(host->fixed_factor_clk); 616 613 init.name = devm_kasprintf(host->controller_dev, GFP_KERNEL, 617 614 "%s#div", dev_name(host->controller_dev)); 615 + if (!init.name) 616 + return -ENOMEM; 617 + 618 618 init.ops = &clk_divider_ops; 619 619 init.flags = CLK_SET_RATE_PARENT; 620 620 init.parent_names = &clk_div_parent;