Unverified Commit 86e2d14b authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: topology: Add header payload_size verification 



Add sanity check to make sure the data is read within file boundary.
Helps in situations where file is only partially copied or malformed.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20211015161257.27052-3-cezary.rojewski@intel.com


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

sound/soc/soc-topology.c

+9 −0
Original line number Diff line number Diff line
@@ -2438,6 +2438,7 @@ static int soc_tplg_manifest_load(struct soc_tplg *tplg, 
		_manifest = manifest;

	} else {

		abi_match = false;



		ret = manifest_new_ver(tplg, manifest, &_manifest);

		if (ret < 0)

			return ret;
@@ -2468,6 +2469,14 @@ static int soc_valid_header(struct soc_tplg *tplg, 
		return -EINVAL;

	}



	if (soc_tplg_get_hdr_offset(tplg) + hdr->payload_size >= tplg->fw->size) {

		dev_err(tplg->dev,

			"ASoC: invalid header of type %d at offset %ld payload_size %d\n",

			le32_to_cpu(hdr->type), soc_tplg_get_hdr_offset(tplg),

			hdr->payload_size);

		return -EINVAL;

	}



	/* big endian firmware objects not supported atm */

	if (le32_to_cpu(hdr->magic) == SOC_TPLG_MAGIC_BIG_ENDIAN) {

		dev_err(tplg->dev,