Fix infinite loop in isPathOnVolume #10238
Merged
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
| @@ -128,7 +128,7 @@ func isPathOnVolume(c *Container, containerPath string) bool { | |||
| if cleanedContainerPath == filepath.Clean(vol.Dest) { | |||
| return true | |||
| } | |||
| for dest := vol.Dest; dest != "/"; dest = filepath.Dir(dest) { | |||
| for dest := vol.Dest; dest != "/" && dest != "."; dest = filepath.Dir(dest) { | |||
There was a problem hiding this comment.
IDK, but wonder if it would be better to add at line 134.5
if dest == "." {
return false}
}
There was a problem hiding this comment.
To me it looks good next to the check for "/".
vrothberg
reviewed
May 6, 2021
| @@ -128,7 +128,7 @@ func isPathOnVolume(c *Container, containerPath string) bool { | |||
| if cleanedContainerPath == filepath.Clean(vol.Dest) { | |||
| return true | |||
| } | |||
| for dest := vol.Dest; dest != "/"; dest = filepath.Dir(dest) { | |||
| for dest := vol.Dest; dest != "/" && dest != "."; dest = filepath.Dir(dest) { | |||
There was a problem hiding this comment.
To me it looks good next to the check for "/".
|
LGTM |
bacher09
force-pushed
the
fix-inf-loop
branch
2 times, most recently
from
681aca4 to
7f7a7c2
Compare
|
@containers/podman-maintainers PTAL |
|
/lgtm |
openshift-ci-robot
added
the
do-not-merge/hold
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: bacher09, mheon The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
filepath.Dir in some cases returns `.` symbol and calling this function again returns same result. In such cases this function never returns and causes some operations to stuck forever. Closes containers#10216 Signed-off-by: Slava Bacherikov <[email protected]>
|
Thanks @bacher09 |
openshift-ci-robot
removed
the
do-not-merge/hold
github-actions
bot
added
the
locked - please file new issue/PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
filepath.Dir in some cases returns
.symbol and calling this function again returns same result. In such cases this function never returns and causes some operations to stuck forever.Closes #10216