Reserve the MCS Level if the caller overrides the default.

runcom · runcom · commit 854f49456e5d · 2017-11-09T17:06:11.000+01:00
Fix https://bugzilla.redhat.com/show_bug.cgi?id=1511442 Signed-off-by: Antonio Murdaca <runcom@redhat.com>
diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/label/label_selinux.go b/vendor/src/github.com/opencontainers/runc/libcontainer/label/label_selinux.go
@@ -49,8 +49,10 @@ func InitLabels(options []string) (string, string, error) {
 				mcon[con[0]] = con[1]
 			}
 		}
+		_ = ReleaseLabel(processLabel)
 		processLabel = pcon.Get()
 		mountLabel = mcon.Get()
+		_ = ReserveLabel(processLabel)
 	}
 	return processLabel, mountLabel, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,10 @@ func InitLabels(options []string) (string, string, error) {`
`49`	`49`	`mcon[con[0]] = con[1]`
`50`	`50`	`}`
`51`	`51`	`}`
	`52`	`+ _ = ReleaseLabel(processLabel)`
`52`	`53`	`processLabel = pcon.Get()`
`53`	`54`	`mountLabel = mcon.Get()`
	`55`	`+ _ = ReserveLabel(processLabel)`
`54`	`56`	`}`
`55`	`57`	`return processLabel, mountLabel, nil`
`56`	`58`	`}`