Commit d753ab11 authored by Yong Zhi's avatar Yong Zhi Committed by Guo Mengqi
Browse files

ASoC: SOF: Fix DSP oops stack dump output contents 

mainline inclusion
from mainline-v5.15-rc4
commit ac4dfccb
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9R4NJ
CVE: CVE-2021-47381

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ac4dfccb96571ca03af7cac64b7a0b2952c97f3a



--------------------------------

Fix @buf arg given to hex_dump_to_buffer() and stack address used
in dump error output.

Fixes: e657c18a ('ASoC: SOF: Add xtensa support')
Signed-off-by: default avatarYong Zhi <yong.zhi@intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@gmail.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20210915063230.29711-1-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parent f88d73a7

sound/soc/sof/xtensa/core.c

+2 −2
Original line number Diff line number Diff line
@@ -122,9 +122,9 @@ static void xtensa_stack(struct snd_sof_dev *sdev, void *oops, u32 *stack, 
	 * 0x0049fbb0: 8000f2d0 0049fc00 6f6c6c61 00632e63

	 */

	for (i = 0; i < stack_words; i += 4) {

		hex_dump_to_buffer(stack + i * 4, 16, 16, 4,

		hex_dump_to_buffer(stack + i, 16, 16, 4,

				   buf, sizeof(buf), false);

		dev_err(sdev->dev, "0x%08x: %s\n", stack_ptr + i, buf);

		dev_err(sdev->dev, "0x%08x: %s\n", stack_ptr + i * 4, buf);

	}

}