Commit b0d06f1c authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Ulf Hansson
Browse files

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: default avatarNicholas Mc Guire <hofrat@osadl.org>
Fixes: ed80a13b ("mmc: meson-mx-sdio: Add a driver for the Amlogic Meson8 and Meson8b SoCs")
Acked-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 48e304cc

drivers/mmc/host/meson-mx-sdio.c

+6 −0
Original line number Diff line number Diff line
@@ -596,6 +596,9 @@ static int meson_mx_mmc_register_clks(struct meson_mx_mmc_host *host) 
	init.name = devm_kasprintf(host->controller_dev, GFP_KERNEL,

				   "%s#fixed_factor",

				   dev_name(host->controller_dev));

	if (!init.name)

		return -ENOMEM;



	init.ops = &clk_fixed_factor_ops;

	init.flags = 0;

	init.parent_names = &clk_fixed_factor_parent;
@@ -612,6 +615,9 @@ static int meson_mx_mmc_register_clks(struct meson_mx_mmc_host *host) 
	clk_div_parent = __clk_get_name(host->fixed_factor_clk);

	init.name = devm_kasprintf(host->controller_dev, GFP_KERNEL,

				   "%s#div", dev_name(host->controller_dev));

	if (!init.name)

		return -ENOMEM;



	init.ops = &clk_divider_ops;

	init.flags = CLK_SET_RATE_PARENT;

	init.parent_names = &clk_div_parent;