[release/1.2 backport] Fix parseInfoFile does not handle spaces in filenames#3161
Merged
estesp merged 2 commits intocontainerd:release/1.2from Apr 2, 2019
Merged
Conversation
`/proc/self/mountinfo` uses `\040` for spaces, however, `parseInfoFile()`
did not decode those spaces in paths, therefore attempting to use `\040`
as a literal part of the path.
This patch un-quotes the `root` and `mount point` fields to fix
situations where paths contain spaces.
Note that the `mount source` field is not modified, given that
this field is documented (man `PROC(5)`) as:
filesystem-specific information or "none"
Which I interpreted as "the format in this field is undefined".
Reported-by: Daniil Yaroslavtsev <[email protected]>
Reported-by: Nathan Ringo <[email protected]>
Based-on-patch-by: Diego Becciolini <[email protected]>
Based-on-patch-by: Sergei Utinski <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit c22effb)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit adc4fa2) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Member
Author
|
didn't backport this (yet) to the 1.1 branch, as it depends on (among others) #2324. Wasn't sure how badly we want this for 1.1, with 1.3 already being worked on |
Codecov Report
@@ Coverage Diff @@
## release/1.2 #3161 +/- ##
===============================================
- Coverage 43.76% 43.74% -0.02%
===============================================
Files 101 101
Lines 10738 10743 +5
===============================================
+ Hits 4699 4700 +1
- Misses 5309 5311 +2
- Partials 730 732 +2
Continue to review full report at Codecov.
|
1 similar comment
Codecov Report
@@ Coverage Diff @@
## release/1.2 #3161 +/- ##
===============================================
- Coverage 43.76% 43.74% -0.02%
===============================================
Files 101 101
Lines 10738 10743 +5
===============================================
+ Hits 4699 4700 +1
- Misses 5309 5311 +2
- Partials 730 732 +2
Continue to review full report at Codecov.
|
Member
|
LGTM |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
backport of #3159 for the 1.2 branch
equivalent to moby/moby#38977, for containerd
relates to moby/moby#38458
relates to kubernetes/kubernetes#35062
/proc/self/mountinfouses\040for spaces, however,parseInfoFile()did not decode those spaces in paths, therefore attempting to use
\040as a literal part of the path.
This patch un-quotes the
rootandmount pointfields to fixsituations where paths contain spaces.
Note that the
mount sourcefield is not modified, given thatthis field is documented (man
PROC(5)) as:Which I interpreted as "the format in this field is undefined".
Thanks to @remexre for reporting, and @itizir, @sergei-utinski for suggesting the patch.