Commit aad172b0 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Jonathan Cameron

iio: adc: meson-saradc: check for devm_kasprintf 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_sar_adc_clk_init() 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: 3adbf342 ("iio: adc: add a driver for the SAR ADC found in Amlogic Meson SoCs")
Acked-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Tested-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent bac257b0
...@@ -658,6 +658,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, ...@@ -658,6 +658,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,
init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%pOF#adc_div", init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%pOF#adc_div",
indio_dev->dev.of_node); indio_dev->dev.of_node);
if (!init.name)
return -ENOMEM;
init.flags = 0; init.flags = 0;
init.ops = &clk_divider_ops; init.ops = &clk_divider_ops;
clk_parents[0] = __clk_get_name(priv->clkin); clk_parents[0] = __clk_get_name(priv->clkin);
...@@ -677,6 +680,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, ...@@ -677,6 +680,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,
init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%pOF#adc_en", init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%pOF#adc_en",
indio_dev->dev.of_node); indio_dev->dev.of_node);
if (!init.name)
return -ENOMEM;
init.flags = CLK_SET_RATE_PARENT; init.flags = CLK_SET_RATE_PARENT;
init.ops = &clk_gate_ops; init.ops = &clk_gate_ops;
clk_parents[0] = __clk_get_name(priv->adc_div_clk); clk_parents[0] = __clk_get_name(priv->adc_div_clk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment