libcontainer/specconv/spec_linux: Avoid panic when Linux is unset

wking · wking · commit ed4b83c0bd93 · 2018-02-20T13:36:04.000-08:00
As it can be since at least opencontainers/runtime-spec@b373a155 (config: Split platform-specific configuration into its own section, 2016-05-02, opencontainers/runtime-spec#414). Signed-off-by: W. Trevor King <wking@tremily.us>
diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go
@@ -257,7 +257,7 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) {
 	}
 	createHooks(spec, config)
 	config.Version = specs.Version
-	if spec.Linux.IntelRdt != nil {
+	if spec.Linux != nil && spec.Linux.IntelRdt != nil {
 		config.IntelRdt = &configs.IntelRdt{}
 		if spec.Linux.IntelRdt.L3CacheSchema != "" {
 			config.IntelRdt.L3CacheSchema = spec.Linux.IntelRdt.L3CacheSchema

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ func CreateLibcontainerConfig(opts CreateOpts) (configs.Config, error) {`
`257`	`257`	`}`
`258`	`258`	`createHooks(spec, config)`
`259`	`259`	`config.Version = specs.Version`
`260`		`- if spec.Linux.IntelRdt != nil {`
	`260`	`+ if spec.Linux != nil && spec.Linux.IntelRdt != nil {`
`261`	`261`	`config.IntelRdt = &configs.IntelRdt{}`
`262`	`262`	`if spec.Linux.IntelRdt.L3CacheSchema != "" {`
`263`	`263`	`config.IntelRdt.L3CacheSchema = spec.Linux.IntelRdt.L3CacheSchema`