Unverified Commit 5708cc2f authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: topology: Fix memory leak of scontrol->name 



The scontrol->name is allocated with kstrdup, it must be freed before the
scontrol is freed to avoid leaking memory.

The constant leaking happens via sof_widget_unload() path on every module
removal.

Fixes: b5cee8fe ("ASoC: SOF: topology: Make control parsing IPC agnostic")
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220331114845.32747-1-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/topology.c

+3 −0
Original line number Diff line number Diff line
@@ -941,11 +941,13 @@ static int sof_control_load(struct snd_soc_component *scomp, int index, 
	default:

		dev_warn(scomp->dev, "control type not supported %d:%d:%d\n",

			 hdr->ops.get, hdr->ops.put, hdr->ops.info);

		kfree(scontrol->name);

		kfree(scontrol);

		return 0;

	}



	if (ret < 0) {

		kfree(scontrol->name);

		kfree(scontrol);

		return ret;

	}
@@ -1380,6 +1382,7 @@ static int sof_widget_unload(struct snd_soc_component *scomp, 
		}

		kfree(scontrol->ipc_control_data);

		list_del(&scontrol->list);

		kfree(scontrol->name);

		kfree(scontrol);

	}