Fix potential out of bounds access in msc_disk.c #2939
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thank you ! |
HiFiPhile
approved these changes
Jan 22, 2025
hathach
reviewed
Jan 25, 2025
| @@ -192,6 +192,9 @@ int32_t tud_msc_read10_cb(uint8_t lun, uint32_t lba, uint32_t offset, void* buff | |||
| // out of ramdisk | |||
| if ( lba >= DISK_BLOCK_NUM ) return -1; | |||
|
|
|||
| // Check for overflow of offset + bufsize | |||
| if ( offset + bufsize >= DISK_BLOCK_SIZE ) return -1; | |||
There was a problem hiding this comment.
Logic is not correct, offset = 0 and bufsize = 512 is correct value. This cause hardware test (hil) to fail on all cdc_msc test. Fixed by #2964
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR addresses a potential buffer overflow issue in the tud_msc_read10_cb function. Previously, the function did not validate whether the combination of offset and bufsize exceeded the disk block size, which could result in out-of-bounds memory access during the memcpy operation.
Changes
Added a validation check to ensure
offset + bufsizedoes not exceed the definedDISK_BLOCK_SIZE. If this condition is violated, the function now returns -1.