Merge pull request moby#4157 from jedevc/fix-provenance-bridge-race

tonistiigi · web-flow · commit 81cd697ae8f1 · 2023-08-17T11:16:56.000-07:00
solver: fix possible race for provenance ResolveImageConfig
diff --git a/solver/llbsolver/provenance.go b/solver/llbsolver/provenance.go
@@ -136,12 +136,14 @@ func (b *provenanceBridge) ResolveImageConfig(ctx context.Context, ref string, o
 		return "", "", nil, err
 	}
 
+	b.mu.Lock()
 	b.images = append(b.images, provenance.ImageSource{
 		Ref:      ref,
 		Platform: opt.Platform,
 		Digest:   dgst,
 		Local:    opt.ResolverType == llb.ResolverTypeOCILayout,
 	})
+	b.mu.Unlock()
 	return ref, dgst, config, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -136,12 +136,14 @@ func (b *provenanceBridge) ResolveImageConfig(ctx context.Context, ref string, o`
`136`	`136`	`return "", "", nil, err`
`137`	`137`	`}`
`138`	`138`
	`139`	`+ b.mu.Lock()`
`139`	`140`	`b.images = append(b.images, provenance.ImageSource{`
`140`	`141`	`Ref: ref,`
`141`	`142`	`Platform: opt.Platform,`
`142`	`143`	`Digest: dgst,`
`143`	`144`	`Local: opt.ResolverType == llb.ResolverTypeOCILayout,`
`144`	`145`	`})`
	`146`	`+ b.mu.Unlock()`
`145`	`147`	`return ref, dgst, config, nil`
`146`	`148`	`}`
`147`	`149`