diff --git a/pkg/cri/server/helpers_linux.go b/pkg/cri/server/helpers_linux.go index a37053f6688d..c542c0e3deff 100644 --- a/pkg/cri/server/helpers_linux.go +++ b/pkg/cri/server/helpers_linux.go @@ -269,17 +269,10 @@ func modifyProcessLabel(runtimeType string, spec *specs.Spec) error { if !isVMBasedRuntime(runtimeType) { return nil } - l, err := getKVMLabel(spec.Process.SelinuxLabel) + l, err := seutil.ChangeToKVM(spec.Process.SelinuxLabel) if err != nil { return errors.Wrap(err, "failed to get selinux kvm label") } spec.Process.SelinuxLabel = l return nil } - -func getKVMLabel(l string) (string, error) { - if !seutil.HasType("container_kvm_t") { - return "", nil - } - return seutil.ChangeToKVM(l) -} diff --git a/pkg/seutil/seutil.go b/pkg/seutil/seutil.go index f453a77753ee..c69065d20f77 100644 --- a/pkg/seutil/seutil.go +++ b/pkg/seutil/seutil.go @@ -17,39 +17,9 @@ package seutil import ( - "bufio" - "os" - "github.com/opencontainers/selinux/go-selinux" ) -var seTypes map[string]struct{} - -const typePath = "/etc/selinux/targeted/contexts/customizable_types" - -func init() { - seTypes = make(map[string]struct{}) - if !selinux.GetEnabled() { - return - } - f, err := os.Open(typePath) - if err != nil { - return - } - defer f.Close() - s := bufio.NewScanner(f) - for s.Scan() { - seTypes[s.Text()] = struct{}{} - } -} - -// HasType returns true if the underlying system has the -// provided selinux type enabled. -func HasType(name string) bool { - _, ok := seTypes[name] - return ok -} - // ChangeToKVM process label func ChangeToKVM(l string) (string, error) { if l == "" || !selinux.GetEnabled() {