sysfs: enable adding caches in unpredictable orders

If the first saved cache was from level 3, saving level 1 after that crashed on a nil map. This change makes sure that there are no nil maps in sys.caches in the saved or levels below that. Signed-off-by: Antti Kervinen <[email protected]>
containers · Oct 16, 2024 · 3c1a1b7 · 3c1a1b7
1 parent 82025f6
commit 3c1a1b7
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pkg/sysfs/system.go b/pkg/sysfs/system.go
@@ -1678,8 +1678,12 @@ func (sys *system) saveCache(c *Cache) *Cache {
 		caches := sys.caches
 		sys.caches = make([][NumCacheTypes]map[idset.ID]*Cache, c.level)
 		copy(sys.caches, caches)
-		for ct := 0; ct < NumCacheTypes; ct++ {
-			sys.caches[c.level-1][ct] = make(map[idset.ID]*Cache)
+		for levelIdx := 0; levelIdx < c.level; levelIdx++ {
+			for ct := 0; ct < NumCacheTypes; ct++ {
+				if sys.caches[levelIdx][ct] == nil {
+					sys.caches[levelIdx][ct] = make(map[idset.ID]*Cache)
+				}
+			}
 		}
 	}