michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc/intel_adsp: cavstool: log out of bounds mmap offsets

Browse source 
The winstream can become corrupted when the firmware hasn't booted or is
in the bad state.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2022-02-10 17:48:20 -08:00 • committed by Anas Nashif
commit e6e8f5de6b
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
soc/xtensa/intel_adsp/tools/cavstool.py
View file

@ -276,8 +276,14 @@ def load_firmware(fw_file):
# array seems to be unreliable on one of my machines (python 3.6.9 on
# Ubuntu 18.04). Read out bytes individually.
def win_read(start, length):
return b''.join(bar4_mmap[x + WINSTREAM_OFFSET].to_bytes(1, 'little')
for x in range(start, start + length))
try:
return b''.join(bar4_mmap[WINSTREAM_OFFSET + x].to_bytes(1, 'little')
for x in range(start, start + length))
except IndexError as ie:
# A FW in a bad state may cause winstream garbage
log.error("IndexError in bar4_mmap[%d + %d]", WINSTREAM_OFFSET, start)
log.error("bar4_mmap.size()=%d", bar4_mmap.size())
raise ie
def win_hdr():
return struct.unpack("<IIII", win_read(0, 16))