Skip to content

Commit e32d0d9

Browse files
committed
libcontainer/specconv/spec_linux: Avoid panic when Process is unset
As it can be since opencontainers/runtime-spec@c41ea83d (config: Make process optional, 2017-02-27, opencontainers/runtime-spec#701). Signed-off-by: W. Trevor King <[email protected]>
1 parent f2628a7 commit e32d0d9

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

libcontainer/specconv/spec_linux.go

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -238,19 +238,21 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) {
238238
config.Seccomp = seccomp
239239
}
240240
}
241-
if spec.Process.SelinuxLabel != "" {
242-
config.ProcessLabel = spec.Process.SelinuxLabel
243-
}
244-
if spec.Process != nil && spec.Process.OOMScoreAdj != nil {
245-
config.OomScoreAdj = *spec.Process.OOMScoreAdj
246-
}
247-
if spec.Process.Capabilities != nil {
248-
config.Capabilities = &configs.Capabilities{
249-
Bounding: spec.Process.Capabilities.Bounding,
250-
Effective: spec.Process.Capabilities.Effective,
251-
Permitted: spec.Process.Capabilities.Permitted,
252-
Inheritable: spec.Process.Capabilities.Inheritable,
253-
Ambient: spec.Process.Capabilities.Ambient,
241+
if spec.Process != nil {
242+
if spec.Process.SelinuxLabel != "" {
243+
config.ProcessLabel = spec.Process.SelinuxLabel
244+
}
245+
if spec.Process.OOMScoreAdj != nil {
246+
config.OomScoreAdj = *spec.Process.OOMScoreAdj
247+
}
248+
if spec.Process.Capabilities != nil {
249+
config.Capabilities = &configs.Capabilities{
250+
Bounding: spec.Process.Capabilities.Bounding,
251+
Effective: spec.Process.Capabilities.Effective,
252+
Permitted: spec.Process.Capabilities.Permitted,
253+
Inheritable: spec.Process.Capabilities.Inheritable,
254+
Ambient: spec.Process.Capabilities.Ambient,
255+
}
254256
}
255257
}
256258
createHooks(spec, config)

0 commit comments

Comments
 (0)