Merge pull request #13831 from LK4D4/update_libcontainer

Update libcontainer to v2.1.1

hack/vendor.sh

@@ -69,7 +69,7 @@ mv tmp-digest src/github.com/docker/distribution/digest
 mkdir -p src/github.com/docker/distribution/registry
 mv tmp-api src/github.com/docker/distribution/registry/api
 
-clone git github.com/docker/libcontainer v2.1.0
+clone git github.com/docker/libcontainer v2.1.1
 # libcontainer deps (see src/github.com/docker/libcontainer/update-vendor.sh)
 clone git github.com/coreos/go-systemd v2
 clone git github.com/godbus/dbus v2

vendor/src/github.com/docker/libcontainer/label/label_selinux.go

@@ -105,14 +105,14 @@ func Relabel(path string, fileLabel string, relabel string) error {
 	if fileLabel == "" {
 		return nil
 	}
+	if !strings.ContainsAny(relabel, "zZ") {
+		return nil
+	}
 	for _, p := range exclude_path {
 		if path == p {
 			return fmt.Errorf("Relabeling of %s is not allowed", path)
 		}
 	}
-	if !strings.ContainsAny(relabel, "zZ") {
-		return nil
-	}
 	if strings.Contains(relabel, "z") && strings.Contains(relabel, "Z") {
 		return fmt.Errorf("Bad SELinux option z and Z can not be used together")
 	}