Fix the problem of Master Node reading errors #116
Conversation
|
Related to #46 |
qkaiser
left a comment
qkaiser
left a comment
There was a problem hiding this comment.
Nice work. Some further improvements can be made. See my comments.
| os.utime(path, (inode['ino'].atime_sec, inode['ino'].mtime_sec), follow_symlinks = False) | ||
| follow_symlinks = False | ||
| if os.name == 'nt': follow_symlinks = True | ||
| os.utime(path, (inode['ino'].atime_sec, inode['ino'].mtime_sec), follow_symlinks=follow_symlinks) |
There was a problem hiding this comment.
This change seems to be unrelated. Please put it in a dedicated commit with a description explaining why you need to follow symlinks on Windows.
There was a problem hiding this comment.
yes, On Windows, this parameter to False will error with Python 3.12, while True will not.
There was a problem hiding this comment.
Noted. Please put that in a dedicated commit.
| if crc != mst_chdr.crc: | ||
| break |
There was a problem hiding this comment.
I would log that the CRC32 does not match:
if crc != mst_chdr.crc:
log(self, 'Master node CRC check failed: expected 0x%x got 0x%x' % (crc, mst_chdr.crc))I'd continue working even in the presence of corrupt master node, this way the tool still extracts something. It may not be the most recent, but at least one that is not corrupt.
if crc != mst_chdr.crc:
log(self, 'Master node CRC check failed: expected 0x%x got 0x%x' % (crc, mst_chdr.crc))
mst_offset += mst_chdr.len
continueWhat do you think ?
There was a problem hiding this comment.
Generally, masternodes are recorded in sequence. If a CRC failure occurs, there should be no normal ones afterwards. However, you can try continuing the scan. I'm not quite sure if the old data has been completely cleared.
There was a problem hiding this comment.
Objective is to be fault-tolerant since ubireader is used by unblob on a variety of weird firmware and image dumps.
|
@scriptkitz do you have some samples you could share ? Ideally a sample that extracts different content between the current |
USRDATA.zip |
2 participants
LEB1/LEB2 contains multiple MasterNodes. The one with the largest cmt_no needs to be scanned, as that is the currently activated one.