docker/internal/tarfile: Fix size reporting for symlink layers#2963
Closed
1seal wants to merge 1 commit intocontainers:mainfrom
Closed
docker/internal/tarfile: Fix size reporting for symlink layers#29631seal wants to merge 1 commit intocontainers:mainfrom
1seal wants to merge 1 commit intocontainers:mainfrom
Conversation
When a layer path in a docker-archive points at a symlink header, prepareLayerData recorded the symlink header size (often 0) while GetBlob followed the symlink and returned the target file bytes. Resolve a single symlink when determining the layer size so the reported size matches the bytes returned by GetBlob, and add a regression test. Signed-off-by: 1seal <security@1seal.org>
|
This repository has been migrated to https://github.com/containers/container-libs. Please open your PR there. |
Author
|
this repo has been migrated to containers/container-libs; i re-opened the same change there: https://github.com/containers/container-libs/pull/605\n\nclosing this PR in favor of the new location. |
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
1 participant
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.
This fixes a mismatch between the size returned by docker/internal/tarfile.Source.GetBlob and the bytes returned when reading docker-archive layers that are stored as symlink entries
(e.g. produced by
docker savefor duplicate layers).Previously, prepareLayerData recorded the symlink header size (often 0), while GetBlob followed the symlink and returned the target file bytes.
Changes:
Tests: