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

[release/1.7 backport] vendor: google.golang.org/protobuf 1.33.0, github.com/golang/protobuf v1.5.4 #9975

Merged
merged 3 commits into from
Mar 22, 2024

Conversation

thaJeztah
Copy link
Member

backport of:

Updating the version to verify compatibility, and to prevent possible incompatiblities if consumers of containerd have to update these, but containerd itself is still on an older version (moby/buildkit#4773 (comment)).

These updates keep the scanners at bay for CVE-2024-24786 / GO-2024-2611, although containerd itself is not affected;

This scan also found 2 vulnerabilities in packages you import and 0 vulnerabilities in modules you require, but your code doesn't appear to call these vulnerabilities.

govulncheck -show=verbose ./...
Scanning your code and 616 packages across 117 dependent modules for known vulnerabilities...

=== Symbol Results ===

No vulnerabilities found.

=== Package Results ===

Vulnerability #1: GO-2024-2631
    Decompression bomb vulnerability in github.com/go-jose/go-jose
  More info: https://pkg.go.dev/vuln/GO-2024-2631
  Module: gopkg.in/square/go-jose.v2
    Found in: gopkg.in/square/go-jose.v2@v2.5.1
    Fixed in: N/A

Vulnerability #2: 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

=== Module Results ===

Vulnerability #1: GO-2023-2402
    Man-in-the-middle attacker can compromise integrity of secure channel in
    golang.org/x/crypto
  More info: https://pkg.go.dev/vuln/GO-2023-2402
  Module: golang.org/x/crypto
    Found in: golang.org/x/crypto@v0.14.0
    Fixed in: golang.org/x/crypto@v0.17.0

Your code is affected by 0 vulnerabilities.
This scan also found 2 vulnerabilities in packages you import and 1
vulnerability in modules you require, but your code doesn't appear to call these
vulnerabilities.

dependabot bot and others added 3 commits March 20, 2024 10:22
Bumps google.golang.org/protobuf from 1.31.0 to 1.32.0.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 7fe038e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Bumps google.golang.org/protobuf from 1.32.0 to 1.33.0.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 10c7f03)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
commit 10c7f03 updated google.golang.org/protobuf
to v1.33.0, which addresses CVE-2024-24786, however a follow-up post on the
Golang security list issued a warning that the v1.33.0 update introduced a
breaking change, causing compatibility with github.com/golang/protobuf to be
broken;

> 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.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 45e425c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah requested a review from dmcgowan March 22, 2024 09:16
@dmcgowan dmcgowan merged commit be5ec97 into containerd:release/1.7 Mar 22, 2024
56 checks passed
Mengkzhaoyun pushed a commit to open-beagle/containerd that referenced this pull request Apr 26, 2024
containerd 1.7.15

Welcome to the v1.7.15 release of containerd!

The fifteenth patch release for containerd 1.7 contains various fixes; one for a
regression introduced in v1.7.14 in the way process exits were handled.

* Adds mediatype to OCI index record on export ([#9990](containerd/containerd#9990))

* Fix runc shim to only defer init process exits ([#10037](containerd/containerd#10037))

Please try out the release binaries and report any issues at
https://github.com/containerd/containerd/issues.

* Derek McGowan
* Phil Estes
* Austin Vazquez
* Laura Brehm
* Sebastiaan van Stijn
* Talon
<details><summary>12 commits</summary>
<p>

* Prepare for v1.7.15 release ([#10039](containerd/containerd#10039))
  * [`4d4759b54`](containerd/containerd@4d4759b) Prep v1.7.15 release
* Fix runc shim to only defer init process exits ([#10037](containerd/containerd#10037))
  * [`21df46766`](containerd/containerd@21df467) runc-shim: only defer init process exits
* Fix compile from version control system (source) use case ([#10012](containerd/containerd#10012))
  * [`2a054213e`](containerd/containerd@2a05421) Fix compile from version control system (source) use case
* Adds mediatype to OCI index record on export ([#9990](containerd/containerd#9990))
  * [`6605c47a4`](containerd/containerd@6605c47) adds mediatype to oci index record
* vendor: google.golang.org/protobuf 1.33.0, github.com/golang/protobuf v1.5.4 ([#9975](containerd/containerd#9975))
  * [`e6d91d843`](containerd/containerd@e6d91d8) vendor: github.com/golang/protobuf v1.5.4
  * [`2d136c5f5`](containerd/containerd@2d136c5) build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0
  * [`a1a7af7a3`](containerd/containerd@a1a7af7) build(deps): bump google.golang.org/protobuf from 1.31.0 to 1.32.0
</p>
</details>

* **github.com/golang/protobuf**  v1.5.3 -> v1.5.4
* **google.golang.org/protobuf**  v1.31.0 -> v1.33.0

Previous release can be found at [v1.7.14](https://github.com/containerd/containerd/releases/tag/v1.7.14)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants