USBMSD security updates (bp #12693) #12727
Merged
Conversation
This file contains hidden or 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
Fix protects underlaying block device from out-of-bound read/writes - prevents the host from setting block device addres larger then block device size - prevents the host from setting wrong read/write lenght (cherry picked from commit ac105f5)
Fix protects underlaying block device from out-of-bound reads (cherry picked from commit 89e67d3)
Fix prevents unaligned USB transfers (cherry picked from commit 1ffb4d7)
|
@mergify[bot], thank you for your changes. |
|
Please include it in next patch release on 5.15 branch. |
maciejbocianski
approved these changes
Mar 31, 2020
0xc0170
approved these changes
Apr 2, 2020
|
CI started |
adbridge
reviewed
Apr 2, 2020
|
|
||
| if (!_cbw.DataLength) { // host requests no data | ||
| if (!_cbw.DataLength || !length_blocks || (length_blocks > _block_count - addr_block) || (_length > _memory_size - _addr)) { // host requests no data or wrong length |
There was a problem hiding this comment.
Using a '!' logical operator to check for a zero value rather than a Boolean is not the best way of doing things but is used elsewhere so is at least consistent. Missed this in the original review!
adbridge
approved these changes
Apr 2, 2020
Test run: FAILEDSummary: 1 of 9 test jobs failed Failed test jobs:
|
|
CI restarted (new CI config) |
Test run: FAILEDSummary: 1 of 9 test jobs failed Failed test jobs:
|
Test run: FAILEDSummary: 1 of 10 test jobs failed Failed test jobs:
|
Test run: SUCCESSSummary: 10 of 10 test jobs passed |
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.
Summary of changes
Backport: Couple of USB MSD fixes improving security:
update USBMSD::infoTransfer implementation ac105f5
Fix protects underlaying block device from out-of-bound read/writes
update USBMSD::memoryRead implementation 89e67d3
Fix protects underlaying block device from out-of-bound reads
update USBMSD::memoryWrite implementation 1ffb4d7
Fix prevents unaligned USB transfers
Impact of changes
Migration actions required
Documentation
Pull request type
Test results
Reviewers