mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Revert "Update runc to 1.0.0"
This commit is contained in:
		
							
								
								
									
										8
									
								
								vendor/github.com/opencontainers/runc/libcontainer/standard_init_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								vendor/github.com/opencontainers/runc/libcontainer/standard_init_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -52,7 +52,7 @@ func (l *linuxStandardInit) Init() error {
 | 
			
		||||
		if err := selinux.SetKeyLabel(l.config.ProcessLabel); err != nil {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
		defer selinux.SetKeyLabel("") //nolint: errcheck
 | 
			
		||||
		defer selinux.SetKeyLabel("")
 | 
			
		||||
		ringname, keepperms, newperms := l.getSessionRingParams()
 | 
			
		||||
 | 
			
		||||
		// Do not inherit the parent's session keyring.
 | 
			
		||||
@@ -151,7 +151,7 @@ func (l *linuxStandardInit) Init() error {
 | 
			
		||||
	if err := selinux.SetExecLabel(l.config.ProcessLabel); err != nil {
 | 
			
		||||
		return errors.Wrap(err, "set process label")
 | 
			
		||||
	}
 | 
			
		||||
	defer selinux.SetExecLabel("") //nolint: errcheck
 | 
			
		||||
	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.
 | 
			
		||||
@@ -183,7 +183,7 @@ func (l *linuxStandardInit) Init() error {
 | 
			
		||||
	}
 | 
			
		||||
	// Close the pipe to signal that we have completed our init.
 | 
			
		||||
	logrus.Debugf("init: closing the pipe to signal completion")
 | 
			
		||||
	_ = l.pipe.Close()
 | 
			
		||||
	l.pipe.Close()
 | 
			
		||||
 | 
			
		||||
	// Close the log pipe fd so the parent's ForwardLogs can exit.
 | 
			
		||||
	if err := unix.Close(l.logFd); err != nil {
 | 
			
		||||
@@ -207,7 +207,7 @@ func (l *linuxStandardInit) Init() error {
 | 
			
		||||
	// N.B. the core issue itself (passing dirfds to the host filesystem) has
 | 
			
		||||
	// since been resolved.
 | 
			
		||||
	// https://github.com/torvalds/linux/blob/v4.9/fs/exec.c#L1290-L1318
 | 
			
		||||
	_ = unix.Close(l.fifoFd)
 | 
			
		||||
	unix.Close(l.fifoFd)
 | 
			
		||||
	// Set seccomp as close to execve as possible, so as few syscalls take
 | 
			
		||||
	// place afterward (reducing the amount of syscalls that users need to
 | 
			
		||||
	// enable in their seccomp profiles).
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user