Unverified Commit c173ee5b authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown
Browse files

ASoC: topology: Return -ENOMEM on memory allocation failure 



When handling error path, ret needs to be set to correct value.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <error27@gmail.com>
Fixes: d29d41e2 ("ASoC: topology: Add support for multiple kcontrol types to a widget")
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20230207210428.2076354-1-amadeuszx.slawinski@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 29aab388

sound/soc/soc-topology.c

+6 −2
Original line number Diff line number Diff line
@@ -1401,13 +1401,17 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, 


	template.num_kcontrols = le32_to_cpu(w->num_kcontrols);

	kc = devm_kcalloc(tplg->dev, le32_to_cpu(w->num_kcontrols), sizeof(*kc), GFP_KERNEL);

	if (!kc)

	if (!kc) {

		ret = -ENOMEM;

		goto hdr_err;

	}



	kcontrol_type = devm_kcalloc(tplg->dev, le32_to_cpu(w->num_kcontrols), sizeof(unsigned int),

				     GFP_KERNEL);

	if (!kcontrol_type)

	if (!kcontrol_type) {

		ret = -ENOMEM;

		goto hdr_err;

	}



	for (i = 0; i < le32_to_cpu(w->num_kcontrols); i++) {

		control_hdr = (struct snd_soc_tplg_ctl_hdr *)tplg->pos;