diff options
| author | Cezary Rojewski <cezary.rojewski@intel.com> | 2021-10-15 18:12:53 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-29 17:49:41 +0200 |
| commit | 86e2d14b6d1a68941b6c0ef39502ec1433b680cb (patch) | |
| tree | 0360fd58aca325152fd2c6bb590e9c591cf48e68 /sound | |
| parent | ASoC: core: Remove invalid snd_soc_component_set_jack call (diff) | |
| download | linux-86e2d14b6d1a68941b6c0ef39502ec1433b680cb.tar.xz linux-86e2d14b6d1a68941b6c0ef39502ec1433b680cb.zip | |
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: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20211015161257.27052-3-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-topology.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 7a4559ddf903..e5352cc6524f 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -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, |