[release-5.29] Fix CVE-2024-3727 #2418
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
If doing it makes sense at all, it should happen before the values are used. Signed-off-by: Miloslav Trmač <[email protected]>
... to prevent panics if the value does not contain a :, or other unexpected values (e.g. a path traversal). Don't bother on paths where we computed the digest ourselves, or it is already trusted for other reasons. Signed-off-by: Miloslav Trmač <[email protected]>
Use defer() to remove the temporary file, instead of duplicating the call. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
Use defer, a nested function, and early returns. Besides being a bit more directly related to what we want to achieve, this now does not call decompressed.Close() on a nil value if DecompressStream fails. Signed-off-by: Miloslav Trmač <[email protected]>
... to prevent unexpected behavior on invalid values. Signed-off-by: Miloslav Trmač <[email protected]>
Signed-off-by: Miloslav Trmač <[email protected]>
|
LGTM, nice work @mtrmac ! |
This was referenced May 28, 2024
Merged
Merged
Merged
Merged
Merged
13 tasks
|
@kwilczynski, I'll let @mtrmac correct me if I'm wrong, but I think you will also want to grab the follow-on fix for this fix for CRI-O. That fix is in this PR on main: #2440 and solves the issue as noted here: containers/skopeo#2346 If it helps, this has been fixed in c/image v5.31.1, v5.30.2, and v5.29.4. If you need older versions fixed, please let us know. |
|
From a very quick check, CRI-O seems to never call the affected |
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.
Digest values used throughout this library were not always validated. That allowed attackers to trigger, when pulling untrusted images, unexpected authenticated registry accesses on behalf of a victim user.
In less common uses of this library (using other transports or not using the
containers/image/v5/copy.ImageAPI), an attacker could also trigger local path traversals or crashes.This is a backport of #2404 . Thanks to @dcermak for independently validating this work via #2415 .