Fix handling of host-local IP address ranges #294
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
When RangeEnd is given, a.end = RangeEnd+1. If when getSearchRange() is called and lastReservedIP equals RangeEnd, a.nextIP() only compares lastReservedIP (which in this example is RangeEnd) against a.end (which in this example is RangeEnd+1) and they clearly don't match, so a.nextIP() returns start=RangeEnd+1 and end=RangeEnd. Get() happily allocates RangeEnd+1 because it only compares 'cur' to the end returned by getSearchRange(), not to a.end, and thus allocates past RangeEnd. Since a.end is inclusive (eg, host-local will allocate a.end) the fix is to simply set a.end equal to RangeEnd.
And also make sure that RangeStart and RangeEnd are sane.
…works There aren't any IPs to allocate in /32 or /31 networks, so don't allow them.
|
@freehan @containernetworking/cni-maintainers |
|
LGTM. Thanks! |
|
LGTM |
|
This looks great, thanks for filling in so much test coverage. Merging... |
Closed
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.
This fixes a couple of issues with RangeEnd/RangeStart and also has a different take on #292.