Fix denial of service with large numbers in cpuset-cpus and cpuset-mems #37967
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
|
ping @justincormack @AkihiroSuda @vdemeester PTAL 🤗 |
thaJeztah
added
status/2-code-review
impact/changelog
and removed
status/0-triage
labels
vdemeester
reviewed
Oct 4, 2018
pkg/parsers/parsers.go
Outdated
| @@ -31,7 +32,7 @@ func ParseKeyValueOpt(opt string) (string, string, error) { | |||
| // 03,1-3 <- this is gonna get parsed as [1,2,3] | |||
| // 3,2,1 | |||
| // 0-2,3,1 | |||
| func ParseUintList(val string) (map[int]bool, error) { | |||
| func ParseUintList(val string, maximum int) (map[int]bool, error) { | |||
There was a problem hiding this comment.
Should we keep the signature (for not breaking downstream-dependencies) and add a new method ParsUintListMaximum or something ?
There was a problem hiding this comment.
Ah, yes; I could add a new one.
Codecov Report
@@ Coverage Diff @@
## master #37967 +/- ##
=========================================
Coverage ? 36.1%
=========================================
Files ? 610
Lines ? 45155
Branches ? 0
=========================================
Hits ? 16302
Misses ? 26612
Partials ? 2241 |
|
@vdemeester pushed an extra commit; if it looks good, I'll squash, and update my backports 😅 |
thaJeztah
force-pushed
the
upstream_dos_fix
branch
from
8e3f241
to
20bee7b
Compare
Using a value such as `--cpuset-mems=1-9223372036854775807` would cause `dockerd` to run out of memory allocating a map of the values in the validation code. Set limits to the normal limit of the number of CPUs, and improve the error handling. Reported by Huawei PSIRT. Signed-off-by: Justin Cormack <justin.cormack@docker.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
upstream_dos_fix
branch
from
20bee7b
to
f8e876d
Compare
|
Squashed; this should be ready to go ping @justincormack PTAL |
runcom
added a commit
to projectatomic/docker
that referenced
this pull request
Jan 18, 2019
Backport of moby#37967 Fix BZ https://bugzilla.redhat.com/show_bug.cgi?id=1666565 Signed-off-by: Antonio Murdaca <runcom@linux.com>
runcom
added a commit
to projectatomic/docker
that referenced
this pull request
Jan 18, 2019
Backport of moby#37967 Fix BZ https://bugzilla.redhat.com/show_bug.cgi?id=1666565 Signed-off-by: Antonio Murdaca <runcom@linux.com>
runcom
added a commit
to projectatomic/docker
that referenced
this pull request
Jan 18, 2019
Backport of moby#37967 Fix BZ https://bugzilla.redhat.com/show_bug.cgi?id=1666565 Signed-off-by: Antonio Murdaca <runcom@linux.com>
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.
Using a value such as
--cpuset-mems=1-9223372036854775807would causedockerdto run out of memory allocating a map of the values in thevalidation code. Set limits to the normal limit of the number of CPUs,
and improve the error handling.
Reported by Huawei PSIRT.
- Description for the changelog