pkg/archive.tarWriter.addFile(): don't change hardlink targets#2357
Merged
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom Jul 28, 2025
Merged
pkg/archive.tarWriter.addFile(): don't change hardlink targets#2357openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom
Conversation
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: nalind The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Member
Author
|
This reverts what I think was an unintentional part of #2289. |
Collaborator
|
(Should this have a test? I’d merge immediately with a unit test.) |
Member
Author
Extended a test to include the case from the original report. |
When examining a file that we're adding to an archive to see if it's hard linked to another file that's already been written, or to one that might be written later, only set an entry in the inode->name map that points to the entry we're writing for the first file. This keeps us from writing tar headers with Typeflag==TypeLink and a Linkname that points to another entry with Typeflag==TypeLink in cases where the inode has more than two names. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
TomSweeneyRedHat
pushed a commit
to TomSweeneyRedHat/storage
that referenced
this pull request
Jul 31, 2025
… targets When examining a file that we're adding to an archive to see if it's hard linked to another file that's already been written, or to one that might be written later, only set an entry in the inode->name map that points to the entry we're writing for the first file. This keeps us from writing tar headers with Typeflag==TypeLink and a Linkname that points to another entry with Typeflag==TypeLink in cases where the inode has more than two names. Addresses: containers/buildah#6297 for the release-1.59 branch and eventualy Buildah v1.41.* and Podman v5.6.* Cherry-pick of containers#2357 Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
TomSweeneyRedHat
pushed a commit
to TomSweeneyRedHat/storage
that referenced
this pull request
Jul 31, 2025
… targets When examining a file that we're adding to an archive to see if it's hard linked to another file that's already been written, or to one that might be written later, only set an entry in the inode->name map that points to the entry we're writing for the first file. This keeps us from writing tar headers with Typeflag==TypeLink and a Linkname that points to another entry with Typeflag==TypeLink in cases where the inode has more than two names. Addresses: containers/buildah#6297 for the release-1.59 branch and eventualy Buildah v1.41.* and Podman v5.6.* Cherry-pick of containers#2357 Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
jankaluza
pushed a commit
to containers/container-libs
that referenced
this pull request
Aug 26, 2025
… targets When examining a file that we're adding to an archive to see if it's hard linked to another file that's already been written, or to one that might be written later, only set an entry in the inode->name map that points to the entry we're writing for the first file. This keeps us from writing tar headers with Typeflag==TypeLink and a Linkname that points to another entry with Typeflag==TypeLink in cases where the inode has more than two names. Addresses: containers/buildah#6297 for the release-1.59 branch and eventualy Buildah v1.41.* and Podman v5.6.* Cherry-pick of containers/storage#2357 Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
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
2 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.
When examining a file that we're adding to an archive to see if it's hard linked to another file that's already been written, or to one that might be written later, only set an entry in the inode->name map that points to the entry we're writing for the first file. This keeps us from writing tar headers with Typeflag==TypeLink and a Linkname that points to another entry with Typeflag==TypeLink in cases where the inode has more than two names.
Fixes containers/buildah#6297.