opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-15 13:48:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6410 from haircommander/fix-segfault

Browse Source 
specgen: fix segfault
This commit is contained in:
OpenShift Merge Robot
2020-05-27 16:30:38 -04:00
committed by GitHub
parent c64abd0b03 339ffd8ade
commit adca437d03
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/specgen/generate/config_linux.go
View File

@ -72,13 +72,17 @@ func addPrivilegedDevices(g *generate.Generator) error {
newMounts = append(newMounts, devMnt) newMounts = append(newMounts, devMnt)
} }
g.Config.Mounts = append(newMounts, g.Config.Mounts...) g.Config.Mounts = append(newMounts, g.Config.Mounts...)
if g.Config.Linux.Resources != nil {
g.Config.Linux.Resources.Devices = nil g.Config.Linux.Resources.Devices = nil
}
} else { } else {
for _, d := range hostDevices { for _, d := range hostDevices {
g.AddDevice(Device(d)) g.AddDevice(Device(d))
} }
// Add resources device - need to clear the existing one first. // Add resources device - need to clear the existing one first.
if g.Config.Linux.Resources != nil {
g.Config.Linux.Resources.Devices = nil g.Config.Linux.Resources.Devices = nil
}
g.AddLinuxResourcesDevice(true, "", nil, nil, "rwm") g.AddLinuxResourcesDevice(true, "", nil, nil, "rwm")
} }