ipsec: Fix off-by-one error on max keyID #16647
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
e89d81a to
43d7dd0
Compare
We encoded the SPI (aka keyID) on 4 bits [1] in the xfrm and packet marks. The maximum value is therefore 15 and not 16. This commit fixes the check on the maximum keyID value. Note the documentation for IPsec key rotation already has the correct value [2] so there shouldn't be any users with an incorrect keyID. 1 - https://github.com/cilium/cilium/blob/v1.10.1/pkg/datapath/linux/ipsec/ipsec_linux.go#L147-L150 2 - https://docs.cilium.io/en/v1.10/gettingstarted/encryption-ipsec/#key-rotation Fixes: b698972 ("cilium: ipsec, support rolling updates") Signed-off-by: Paul Chaignon <paul@cilium.io>
43d7dd0 to
964a1ad
Compare
|
test-me-please |
|
Hi @pchaigno / @joestringer Can we mark this PR for backport as well, since we hit this issues with the old docs pre #19893. We have this cherry-picked in our internal v1.9 release, but if we can get this into the v1.10 (and maybe also v1.9), that would help limit the number of changes we have to cherry-pick Thanks! |
This was referenced Jun 10, 2022
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.
We encoded the SPI (aka keyID) on 4 bits in the xfrm and packet marks. The maximum value is therefore 15 and not 16. This pull request fixes the check on the maximum keyID value.
Note the documentation for IPsec key rotation already has the correct value so there shouldn't be any users with an incorrect keyID.
Fixes: #7450