jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix preserve-fds flag may cause runc hang 

Signed-off-by: lifubang <lifubang@acmcoder.com>
This commit is contained in:
lifubang 2019-02-28 16:44:37 +08:00
parent f79e211b1d
commit 7cb3cde1f4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils_linux.go
View File

@ -3,7 +3,6 @@
package main package main
import ( import (
"errors"
"fmt" "fmt"
"net" "net"
"os" "os"
@ -20,6 +19,7 @@ import (
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/coreos/go-systemd/activation" "github.com/coreos/go-systemd/activation"
"github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
@ -281,6 +281,11 @@ func (r *runner) run(config *specs.Process) (int, error) {
} }
baseFd := 3 + len(process.ExtraFiles) baseFd := 3 + len(process.ExtraFiles)
for i := baseFd; i < baseFd+r.preserveFDs; i++ { for i := baseFd; i < baseFd+r.preserveFDs; i++ {
_, err := os.Stat(fmt.Sprintf("/proc/self/fd/%d", i))
if err != nil {
r.destroy()
return -1, errors.Wrapf(err, "please check that preserved-fd %d (of %d) is present", i-baseFd, r.preserveFDs)
}
process.ExtraFiles = append(process.ExtraFiles, os.NewFile(uintptr(i), "PreserveFD:"+strconv.Itoa(i))) process.ExtraFiles = append(process.ExtraFiles, os.NewFile(uintptr(i), "PreserveFD:"+strconv.Itoa(i)))
} }
rootuid, err := r.container.Config().HostRootUID() rootuid, err := r.container.Config().HostRootUID()