client: use io.LimitedReader for reading HTTP error #38006
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
client.checkResponseErr() was hanging and consuming infinite memory when the serverResp.Body io.Reader returns infinite stream. This commit prohibits reading more than 1MiB. Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
tonistiigi
approved these changes
Oct 10, 2018
Codecov Report
@@ Coverage Diff @@
## master #38006 +/- ##
=========================================
- Coverage 36.13% 36.03% -0.1%
=========================================
Files 610 610
Lines 45159 45291 +132
=========================================
+ Hits 16316 16322 +6
- Misses 26605 26732 +127
+ Partials 2238 2237 -1 |
thaJeztah
added a commit
to thaJeztah/cli
that referenced
this pull request
Mar 27, 2019
relevant changes; - moby/moby#38006 / docker-archive/engine#114 client: use io.LimitedReader for reading HTTP error - moby/moby#38634 / docker-archive/engine#167 pkg/archive:CopyTo(): fix for long dest filename - fixes docker/for-linux#484 for 18.09 - moby/moby#38944 / docker-archive/engine#183 gitutils: add validation for ref - moby/moby#37780 / docker-archive/engine#55 pkg/progress: work around closing closed channel panic - addresses moby/moby#/37735 pkg/progress: panic due to race on shutdown Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Mar 27, 2019
relevant changes; - moby/moby#38006 / docker-archive/engine#114 client: use io.LimitedReader for reading HTTP error - moby/moby#38634 / docker-archive/engine#167 pkg/archive:CopyTo(): fix for long dest filename - fixes docker/for-linux#484 for 18.09 - moby/moby#38944 / docker-archive/engine#183 gitutils: add validation for ref - moby/moby#37780 / docker-archive/engine#55 pkg/progress: work around closing closed channel panic - addresses moby/moby#/37735 pkg/progress: panic due to race on shutdown Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 010c234a0d5a03d450ebec60be37dd9f279feeca Component: cli
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.
Signed-off-by: Akihiro Suda suda.akihiro@lab.ntt.co.jp
- What I did
client.checkResponseErr()was hanging and consuming infinite memorywhen the
serverResp.Bodyio.Readerreturns infinite stream.This commit prohibits reading more than 1MiB.
- How I did it
use
io.LimitedReaderwith 1 MiB limit.- How to verify it
go test -run TestInfinite -v ./client/(hangs and consumes all memory without the fix forrequest.go)- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)
🐧