Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: Bump to latest vishvananda/netlink #15461

Merged
merged 1 commit into from
Mar 26, 2021

Conversation

joestringer
Copy link
Member

This includes the upstreamed version of the encryption fixes we were
previously carrying in a Cilium library fork of the upstream library.

Should we backport this given that PR #15048 was backported to {1.8,1.9}?

This includes the upstreamed version of the encryption fixes we were
previously carrying in a Cilium library fork of the upstream library.

Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer requested a review from a team March 25, 2021 00:49
@joestringer joestringer requested a review from a team as a code owner March 25, 2021 00:49
@joestringer joestringer added area/encryption Impacts encryption support such as IPSec, WireGuard, or kTLS. release-note/misc This PR makes changes that have no direct user impact. labels Mar 25, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. and removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Mar 25, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Mar 25, 2021
@@ -248,6 +248,7 @@ func parseXfrmPolicy(m []byte, family int) (*XfrmPolicy, error) {
resTmpl.Mode = Mode(tmpl.Mode)
resTmpl.Spi = int(nl.Swap32(tmpl.XfrmId.Spi))
resTmpl.Reqid = int(tmpl.Reqid)
resTmpl.Optional = int(tmpl.Optional)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only practical difference from the encryption side. Basically when deserializing kernel objects, we will read the new field back out. I don't think we were relying on this side of things. /cc @jrfastab

@pchaigno
Copy link
Member

test-me-please

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 25, 2021
@rolinh rolinh removed their assignment Mar 25, 2021
@brb brb merged commit 1b2c604 into cilium:master Mar 26, 2021
1.10.0 automation moved this from In progress to Done Mar 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/encryption Impacts encryption support such as IPSec, WireGuard, or kTLS. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

5 participants