[25.0 backport] vendor: google.golang.org/protobuf v1.33.0, github.com/golang/protobu… #47753
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
austinvazquez
changed the title
austinvazquez
force-pushed
the
cherry-pick-1ca89d7eae84346a7241f9d7033a7f591ff3a1fa-to-25.0
branch
from
4f96fbf
to
1bbbbbf
Compare
full diff: https://github.com/golang/sync/comopare/v0.3.0...v0.5.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: - https://github.com/golang/mod/comopare/v0.11.0...v0.13.0 - https://github.com/golang/tools/comopare/v0.10.0...v0.13.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 2799417) Signed-off-by: Austin Vazquez <macedonv@amazon.com>
full diff: googleapis/google-cloud-go@logging/v1.7.0...logging/v1.8.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 10a72f2) Signed-off-by: Austin Vazquez <macedonv@amazon.com>
…f v1.5.4 full diffs: - protocolbuffers/protobuf-go@v1.31.0...v1.33.0 - golang/protobuf@v1.5.3...v1.5.4 From the Go security announcement list; > Version v1.33.0 of the google.golang.org/protobuf module fixes a bug in > the google.golang.org/protobuf/encoding/protojson package which could cause > the Unmarshal function to enter an infinite loop when handling some invalid > inputs. > > This condition could only occur when unmarshaling into a message which contains > a google.protobuf.Any value, or when the UnmarshalOptions.UnmarshalUnknown > option is set. Unmarshal now correctly returns an error when handling these > inputs. > > This is CVE-2024-24786. In a follow-up post; > A small correction: This vulnerability applies when the UnmarshalOptions.DiscardUnknown > option is set (as well as when unmarshaling into any message which contains a > google.protobuf.Any). There is no UnmarshalUnknown option. > > In addition, version 1.33.0 of google.golang.org/protobuf inadvertently > introduced an incompatibility with the older github.com/golang/protobuf > module. (golang/protobuf#1596) Users of the older > module should update to github.com/golang/protobuf@v1.5.4. govulncheck results in our code: govulncheck ./... Scanning your code and 1221 packages across 204 dependent modules for known vulnerabilities... === Symbol Results === Vulnerability #1: GO-2024-2611 Infinite loop in JSON unmarshaling in google.golang.org/protobuf More info: https://pkg.go.dev/vuln/GO-2024-2611 Module: google.golang.org/protobuf Found in: google.golang.org/protobuf@v1.31.0 Fixed in: google.golang.org/protobuf@v1.33.0 Example traces found: #1: daemon/logger/gcplogs/gcplogging.go:154:18: gcplogs.New calls logging.Client.Ping, which eventually calls json.Decoder.Peek #2: daemon/logger/gcplogs/gcplogging.go:154:18: gcplogs.New calls logging.Client.Ping, which eventually calls json.Decoder.Read moby#3: daemon/logger/gcplogs/gcplogging.go:154:18: gcplogs.New calls logging.Client.Ping, which eventually calls protojson.Unmarshal Your code is affected by 1 vulnerability from 1 module. This scan found no other vulnerabilities in packages you import or modules you require. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 1ca89d7) Signed-off-by: Austin Vazquez <macedonv@amazon.com>
austinvazquez
force-pushed
the
cherry-pick-1ca89d7eae84346a7241f9d7033a7f591ff3a1fa-to-25.0
branch
from
1bbbbbf
to
3d56d73
Compare
corhere
approved these changes
May 2, 2024
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.
- What I did
Backports #47562 to resolve GO-2024-2611 for 25.0 branch.
Transitively required backport of:
- How I did it
- How to verify it
CI is successful
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)