Unverified Commit 941d3f0d authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: topology: Prevent NULL pointer dereference with no TLV 



When there is no TLV data in topology, extracting the TLV data
could result in a NULL pointer exception. Prevent this by making
sure that the TLV data exists before extracting it.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarPaul Olaru <paul.olaru@oss.nxp.com>
Reviewed-by: default avatarBard Liao <bard.liao@intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210201093128.1226603-1-kai.vehmanen@linux.intel.com


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

sound/soc/sof/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -1073,7 +1073,7 @@ static int sof_control_load_volume(struct snd_soc_component *scomp, 
	scontrol->cmd = SOF_CTRL_CMD_VOLUME;



	/* extract tlv data */

	if (get_tlv_data(kc->tlv.p, tlv) < 0) {

	if (!kc->tlv.p || get_tlv_data(kc->tlv.p, tlv) < 0) {

		dev_err(scomp->dev, "error: invalid TLV data\n");

		ret = -EINVAL;

		goto out_free;