diff options
| author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2019-09-27 15:05:36 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-10-01 18:31:53 +0100 |
| commit | ff2be865633e6fa523cd2db3b73197d795dec991 (patch) | |
| tree | 34b7f9d9922ee58a045bba7d8658c4a45829ffe2 /sound/soc/sof/intel/hda.c | |
| parent | 4ff5f6439fe69624e8f7d559915e9b54a6477684 (diff) | |
| download | linux-ff2be865633e6fa523cd2db3b73197d795dec991.tar.gz linux-ff2be865633e6fa523cd2db3b73197d795dec991.tar.bz2 linux-ff2be865633e6fa523cd2db3b73197d795dec991.zip | |
ASoC: SOF: Intel: initialise and verify FW crash dump data.
FW mailbox offset was not set before use and HDR size was not validated.
Fix this.
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190927200538.660-12-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof/intel/hda.c')
| -rw-r--r-- | sound/soc/sof/intel/hda.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index c72e9a09eee1..06e84679087b 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -35,6 +35,8 @@ #define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348) #define IS_CNL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9dc8) +#define EXCEPT_MAX_HDR_SIZE 0x400 + /* * Debug */ @@ -131,6 +133,11 @@ static void hda_dsp_get_registers(struct snd_sof_dev *sdev, /* note: variable AR register array is not read */ /* then get panic info */ + if (xoops->arch_hdr.totalsize > EXCEPT_MAX_HDR_SIZE) { + dev_err(sdev->dev, "invalid header size 0x%x. FW oops is bogus\n", + xoops->arch_hdr.totalsize); + return; + } offset += xoops->arch_hdr.totalsize; sof_block_read(sdev, sdev->mmio_bar, offset, panic_info, sizeof(*panic_info)); |