mawei
/
panda
mirror of https://github.com/commaai/panda.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IsoTpMessage: fix rx_len sanity checks (#1319) 

fix a bug
This commit is contained in:
Shane Smiskol 2023-03-31 19:17:16 -07:00 committed by GitHub
parent cb35309160
commit c92f8ecfde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/uds.py
View File

@ -460,7 +460,7 @@ class IsoTpMessage():
# single rx_frame
if rx_data[0] >> 4 == 0x0:
self.rx_len = rx_data[0] & 0xFF
assert self.rx_len <= 0x7, f"isotp - rx: invalid single frame length: {self.rx_len}"
assert self.rx_len < self.max_len, f"isotp - rx: invalid single frame length: {self.rx_len}"
self.rx_dat = rx_data[1:1 + self.rx_len]
self.rx_idx = 0
self.rx_done = True
@ -470,7 +470,7 @@ class IsoTpMessage():
# first rx_frame
elif rx_data[0] >> 4 == 0x1:
self.rx_len = ((rx_data[0] & 0x0F) << 8) + rx_data[1]
assert 0x8 <= self.rx_len, f"isotp - rx: invalid first frame length: {self.rx_len}"
assert self.max_len <= self.rx_len, f"isotp - rx: invalid first frame length: {self.rx_len}"
self.rx_dat = rx_data[2:]
self.rx_idx = 0
self.rx_done = False