Merge pull request #6410 from haircommander/fix-segfault

specgen: fix segfault
containers · May 27, 2020 · adca437 · adca437
2 parents c64abd0 + 339ffd8
commit adca437
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go
@@ -72,13 +72,17 @@ func addPrivilegedDevices(g *generate.Generator) error {
 			newMounts = append(newMounts, devMnt)
 		}
 		g.Config.Mounts = append(newMounts, g.Config.Mounts...)
-		g.Config.Linux.Resources.Devices = nil
+		if g.Config.Linux.Resources != nil {
+			g.Config.Linux.Resources.Devices = nil
+		}
 	} else {
 		for _, d := range hostDevices {
 			g.AddDevice(Device(d))
 		}
 		// Add resources device - need to clear the existing one first.
-		g.Config.Linux.Resources.Devices = nil
+		if g.Config.Linux.Resources != nil {
+			g.Config.Linux.Resources.Devices = nil
+		}
 		g.AddLinuxResourcesDevice(true, "", nil, nil, "rwm")
 	}