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

[25.0 backport] vendor: golang.org/x/sys v0.18.0, golang.org/x/term v0.18.0, golang.org/x/crypto v0.21.0, golang.org/x/net v0.23.0 #5279

Merged

Conversation

austinvazquez
Copy link
Contributor

@austinvazquez austinvazquez commented Jul 22, 2024

- What I did
Backports #4998 to 25.0

- How I did it

git cherry-pick -xsS 9a2133f2d40d4e0f382612772f3c5a1ee343217d
git cherry-pick -xsS c7a50ebb9f3509cbe5512c48a968bbd201e52930
git cherry-pick -xsS 4745b957d2ba66e80ad8991cb64b18dec4706ea1
git cherry-pick -xsS 5fcbbde4b924056632e1d446cc4aec826cc2eeea

- How to verify it
CI must be successful

- Description for the changelog

vendor: golang.org/x/sys v0.18.0, golang.org/x/term v0.18.0, golang.org/x/crypto v0.21.0, golang.org/x/net v0.23.0

- A picture of a cute animal (not mandatory but encouraged)

full diff: golang/sys@v0.16.0...v0.18.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9a2133f)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
no changes in vendored code

full diff: golang/term@v0.15.0...v0.18.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c7a50eb)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
full diffs changes relevant to vendored code:

- golang/net@v0.19.0...v0.22.0
    - http2: remove suspicious uint32->v conversion in frame code
    - http2: send an error of FLOW_CONTROL_ERROR when exceed the maximum octets
- golang/crypto@v0.17.0...v0.21.0
    - (no changes in vendored code)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4745b95)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
full diff: golang/net@v0.22.0...v0.23.0

Includes a fix for CVE-2023-45288, which is also addressed in go1.22.2
and go1.21.9;

> http2: close connections when receiving too many headers
>
> Maintaining HPACK state requires that we parse and process
> all HEADERS and CONTINUATION frames on a connection.
> When a request's headers exceed MaxHeaderBytes, we don't
> allocate memory to store the excess headers but we do
> parse them. This permits an attacker to cause an HTTP/2
> endpoint to read arbitrary amounts of data, all associated
> with a request which is going to be rejected.
>
> Set a limit on the amount of excess header frames we
> will process before closing a connection.
>
> Thanks to Bartek Nowotarski for reporting this issue.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5fcbbde)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
@codecov-commenter
Copy link

codecov-commenter commented Jul 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 61.35%. Comparing base (26850c6) to head (02b4820).
Report is 14 commits behind head on 25.0.

Additional details and impacted files
@@            Coverage Diff             @@
##             25.0    #5279      +/-   ##
==========================================
- Coverage   61.36%   61.35%   -0.01%     
==========================================
  Files         290      290              
  Lines       20098    20098              
==========================================
- Hits        12334    12332       -2     
- Misses       6871     6872       +1     
- Partials      893      894       +1     

@austinvazquez austinvazquez marked this pull request as ready for review July 22, 2024 17:18
@thaJeztah thaJeztah added this to the 25.0.6 milestone Jul 23, 2024
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah merged commit 0e8f523 into docker:25.0 Jul 23, 2024
98 checks passed
@austinvazquez austinvazquez deleted the vendor-golang.org-updates-to-25.0 branch July 23, 2024 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants