diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-03 17:07:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 17:07:23 +0200 |
| commit | e4cce8f34f86b12d53faeb9f0c14b0b871560f5b (patch) | |
| tree | e2c5590ea5ac2b08ff298fa8b4c00ac4f4a7b3e2 /vendor | |
| parent | b64e20a53d3f5de262f2c475be490b35977d5f32 (diff) | |
| parent | 48ea142ca5a94a386593802b8068ce53de72b3ec (diff) | |
| download | podman-e4cce8f34f86b12d53faeb9f0c14b0b871560f5b.tar.gz podman-e4cce8f34f86b12d53faeb9f0c14b0b871560f5b.tar.bz2 podman-e4cce8f34f86b12d53faeb9f0c14b0b871560f5b.zip | |
Merge pull request #10544 from containers/dependabot/go_modules/github.com/docker/docker-20.10.7incompatible
Bump github.com/docker/docker from 20.10.6+incompatible to 20.10.7+incompatible
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/docker/docker/pkg/archive/archive.go | 16 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 16 insertions, 2 deletions
diff --git a/vendor/github.com/docker/docker/pkg/archive/archive.go b/vendor/github.com/docker/docker/pkg/archive/archive.go index 8d14b7869..50b83c62c 100644 --- a/vendor/github.com/docker/docker/pkg/archive/archive.go +++ b/vendor/github.com/docker/docker/pkg/archive/archive.go @@ -402,10 +402,24 @@ func fillGo18FileTypeBits(mode int64, fi os.FileInfo) int64 { // ReadSecurityXattrToTarHeader reads security.capability xattr from filesystem // to a tar header func ReadSecurityXattrToTarHeader(path string, hdr *tar.Header) error { + const ( + // Values based on linux/include/uapi/linux/capability.h + xattrCapsSz2 = 20 + versionOffset = 3 + vfsCapRevision2 = 2 + vfsCapRevision3 = 3 + ) capability, _ := system.Lgetxattr(path, "security.capability") if capability != nil { + length := len(capability) + if capability[versionOffset] == vfsCapRevision3 { + // Convert VFS_CAP_REVISION_3 to VFS_CAP_REVISION_2 as root UID makes no + // sense outside the user namespace the archive is built in. + capability[versionOffset] = vfsCapRevision2 + length = xattrCapsSz2 + } hdr.Xattrs = make(map[string]string) - hdr.Xattrs["security.capability"] = string(capability) + hdr.Xattrs["security.capability"] = string(capability[:length]) } return nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index d0b65cbf5..aef3e5127 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -278,7 +278,7 @@ github.com/docker/distribution/registry/client/auth/challenge github.com/docker/distribution/registry/client/transport github.com/docker/distribution/registry/storage/cache github.com/docker/distribution/registry/storage/cache/memory -# github.com/docker/docker v20.10.6+incompatible +# github.com/docker/docker v20.10.7+incompatible github.com/docker/docker/api github.com/docker/docker/api/types github.com/docker/docker/api/types/blkiodev |