mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	vendor: update google/cadvisor and opencontainers/runc
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
		
							
								
								
									
										11
									
								
								vendor/github.com/opencontainers/runc/libcontainer/setns_init_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								vendor/github.com/opencontainers/runc/libcontainer/setns_init_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -11,9 +11,8 @@ import (
 | 
			
		||||
	"github.com/opencontainers/runc/libcontainer/keys"
 | 
			
		||||
	"github.com/opencontainers/runc/libcontainer/seccomp"
 | 
			
		||||
	"github.com/opencontainers/runc/libcontainer/system"
 | 
			
		||||
	"github.com/opencontainers/selinux/go-selinux/label"
 | 
			
		||||
	"github.com/opencontainers/selinux/go-selinux"
 | 
			
		||||
	"github.com/pkg/errors"
 | 
			
		||||
 | 
			
		||||
	"golang.org/x/sys/unix"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
@@ -34,10 +33,10 @@ func (l *linuxSetnsInit) Init() error {
 | 
			
		||||
	defer runtime.UnlockOSThread()
 | 
			
		||||
 | 
			
		||||
	if !l.config.Config.NoNewKeyring {
 | 
			
		||||
		if err := label.SetKeyLabel(l.config.ProcessLabel); err != nil {
 | 
			
		||||
		if err := selinux.SetKeyLabel(l.config.ProcessLabel); err != nil {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
		defer label.SetKeyLabel("")
 | 
			
		||||
		defer selinux.SetKeyLabel("")
 | 
			
		||||
		// Do not inherit the parent's session keyring.
 | 
			
		||||
		if _, err := keys.JoinSessionKeyring(l.getSessionRingName()); err != nil {
 | 
			
		||||
			// Same justification as in standart_init_linux.go as to why we
 | 
			
		||||
@@ -62,10 +61,10 @@ func (l *linuxSetnsInit) Init() error {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	if err := label.SetProcessLabel(l.config.ProcessLabel); err != nil {
 | 
			
		||||
	if err := selinux.SetExecLabel(l.config.ProcessLabel); err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
	defer label.SetProcessLabel("")
 | 
			
		||||
	defer selinux.SetExecLabel("")
 | 
			
		||||
	// Without NoNewPrivileges seccomp is a privileged operation, so we need to
 | 
			
		||||
	// do this before dropping capabilities; otherwise do it as late as possible
 | 
			
		||||
	// just before execve so as few syscalls take place after it as possible.
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user