containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1942 from giuseppe/always-consume-tar-split-data 

chunked: fix deadlock by always consuming tar-split
This commit is contained in:
openshift-merge-bot[bot] 2024-06-04 13:38:23 +00:00 committed by GitHub
parent 9661c8f9f8 4595fa2aab
commit 45933193bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/chunked/compression_linux.go
View File

@ -210,14 +210,13 @@ func readZstdChunkedManifest(blobStream ImageSourceSeekable, tocDigest digest.Di
decodedTarSplit := []byte{} decodedTarSplit := []byte{}
if tarSplitChunk.Offset > 0 { if tarSplitChunk.Offset > 0 {
tarSplitDigest := toc.TarSplitDigest.String() // we must consume the data to not block the producer
// ignore the tar-split data if the digest was not specified tarSplit, err := readBlob(tarSplitChunk.Length)
if tarSplitDigest != "" { if err != nil {
tarSplit, err := readBlob(tarSplitChunk.Length) return nil, nil, nil, 0, err
if err != nil { }
return nil, nil, nil, 0, err // but ignore it when the digest is not present, because we can’t authenticate it against tocDigest
} if toc.TarSplitDigest != "" {
decodedTarSplit, err = decodeAndValidateBlob(tarSplit, tarSplitLengthUncompressed, toc.TarSplitDigest.String()) decodedTarSplit, err = decodeAndValidateBlob(tarSplit, tarSplitLengthUncompressed, toc.TarSplitDigest.String())
if err != nil { if err != nil {
return nil, nil, nil, 0, fmt.Errorf("validating and decompressing tar-split: %w", err) return nil, nil, nil, 0, fmt.Errorf("validating and decompressing tar-split: %w", err)