[PATCH] ASoC: codecs: Check for error pointer after calling devm_regmap_init_mmio

[Srinivas Kandagatla]

On 11/01/2022 01:32, Jiasheng Jiang wrote:
> The devm_regmap_init_mmio() may return error pointer under certain
> circumstances, for example the possible failure of the kzalloc() in
> regmap_mmio_gen_context(), which is called by devm_regmap_init_mmio().
> Then the error pointer will be dereferenced.
> For example rx->regmap will be used in rx_macro_mclk_enable().
> Therefore, it should be better to check it.
> 
> Fixes: af3d54b99764 ("ASoC: codecs: lpass-rx-macro: add support for lpass rx macro")
> Fixes: c39667ddcfc5 ("ASoC: codecs: lpass-tx-macro: add support for lpass tx macro")
> Fixes: 809bcbcecebf ("ASoC: codecs: lpass-wsa-macro: Add support to WSA Macro")
> Signed-off-by: Jiasheng Jiang <jiasheng at iscas.ac.cn>
Thanks for the patch,

LGTM,

Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla at linaro.org>

> ---
>   sound/soc/codecs/lpass-rx-macro.c  | 2 ++
>   sound/soc/codecs/lpass-tx-macro.c  | 2 ++
>   sound/soc/codecs/lpass-wsa-macro.c | 2 ++
>   3 files changed, 6 insertions(+)
> 
> diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c
> index 07894ec5e7a6..2adbf2e2697f 100644
> --- a/sound/soc/codecs/lpass-rx-macro.c
> +++ b/sound/soc/codecs/lpass-rx-macro.c
> @@ -3542,6 +3542,8 @@ static int rx_macro_probe(struct platform_device *pdev)
>   		return PTR_ERR(base);
>   
>   	rx->regmap = devm_regmap_init_mmio(dev, base, &rx_regmap_config);
> +	if (IS_ERR(rx->regmap))
> +		return PTR_ERR(rx->regmap);
>   
>   	dev_set_drvdata(dev, rx);
>   
> diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c
> index 27a0d5defd27..e4bbc6bd4925 100644
> --- a/sound/soc/codecs/lpass-tx-macro.c
> +++ b/sound/soc/codecs/lpass-tx-macro.c
> @@ -1803,6 +1803,8 @@ static int tx_macro_probe(struct platform_device *pdev)
>   		return PTR_ERR(base);
>   
>   	tx->regmap = devm_regmap_init_mmio(dev, base, &tx_regmap_config);
> +	if (IS_ERR(tx->regmap))
> +		return PTR_ERR(tx->regmap);
>   
>   	dev_set_drvdata(dev, tx);
>   
> diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c
> index d3ac318fd6b6..dd1a8b7bc794 100644
> --- a/sound/soc/codecs/lpass-wsa-macro.c
> +++ b/sound/soc/codecs/lpass-wsa-macro.c
> @@ -2405,6 +2405,8 @@ static int wsa_macro_probe(struct platform_device *pdev)
>   		return PTR_ERR(base);
>   
>   	wsa->regmap = devm_regmap_init_mmio(dev, base, &wsa_regmap_config);
> +	if (IS_ERR(wsa->regmap))
> +		return PTR_ERR(wsa->regmap);
>   
>   	dev_set_drvdata(dev, wsa);
>   
>