(*Store)Layer(): fix race when loading layers

Make sure that the layer store is locked when loading the layers. Reported-in: github.com/containers/podman/issues/11487 Signed-off-by: Valentin Rothberg <[email protected]>
containers · Sep 9, 2021 · 6f10616 · 6f10616
1 parent 79a3135
commit 6f10616
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/store.go b/store.go
@@ -3054,10 +3054,15 @@ func (s *store) Layers() ([]Layer, error) {
 	if err != nil {
 		return nil, err
 	}
-	if err := lstore.LoadLocked(); err != nil {
-		return nil, err
-	}
-	layers, err := lstore.Layers()
+
+	layers, err := func() ([]Layer, error) {
+		lstore.Lock()
+		defer lstore.Unlock()
+		if err := lstore.Load(); err != nil {
+			return nil, err
+		}
+		return lstore.Layers()
+	}()
 	if err != nil {
 		return nil, err
 	}