rtl8169: Fix IDR4 out-of-bounds read, snapshot the MAC address - #321
Open
BeastLe9enD wants to merge 2 commits into
Open
BeastLe9enD wants to merge 2 commits into
BeastLe9enD wants to merge 2 commits into
Conversation
An IDR4 read fetches four bytes starting at offset 4 of the six-byte MAC address, so the read went two bytes past the buffer.
The guest keeps using the MAC address it read at boot, so restore it on the TAP device when resuming a snapshot instead of keeping whatever address the new TAP device came up with.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Two small fixes around the MAC address handling in the RTL8169 model.
rtl8169_pci_read()reads IDR0/IDR4 from a six-bytemac[]buffer.The IDR4 case does a 32-bit read at offset 4, which runs two bytes
past the end of the array. Pad the buffer to eight bytes.
rtl8169_suspend()already snapshots the EEPROM, but not the MACaddress the TAP device was created with. After resuming a snapshot on
a fresh TAP device the guest keeps using the address it read at boot,
while the TAP now answers to a different one. Store the address in
the snapshot and push it back into the TAP device on resume, next to
the existing EEPROM snapshot.