4 files changed, 35 insertions, 78 deletions

diff --git a/runsc/boot/controller.go b/runsc/boot/controller.go
index 45aa255c4..fd5b7cc9e 100644
--- a/runsc/boot/controller.go
+++ b/runsc/boot/controller.go
@@ -224,21 +224,39 @@ func (cm *containerManager) Start(args *StartArgs, _ *struct{}) error {
 	return nil
 }
 
+// ExecArgs contains arguments to Execute.
+type ExecArgs struct {
+	control.ExecArgs
+
+	// CID is the ID of the container to exec in.
+	CID string
+}
+
 // Execute runs a command on a created or running sandbox.
-func (cm *containerManager) Execute(e *control.ExecArgs, waitStatus *uint32) error {
+func (cm *containerManager) Execute(e *ExecArgs, waitStatus *uint32) error {
 	log.Debugf("containerManager.Execute: %+v", *e)
 
-	if e.Filename == "" {
-		rootCtx := cm.l.rootProcArgs.NewContext(cm.l.k)
-		rootMns := cm.l.k.RootMountNamespace()
-		var err error
-		if e.Filename, err = getExecutablePath(rootCtx, rootMns, e.Argv[0], e.Envv); err != nil {
-			return fmt.Errorf("error getting executable path for %q: %v", e.Argv[0], err)
-		}
+	// Get the container Root Dirent from the Task, since we must run this
+	// process with the same Root.
+	cm.l.mu.Lock()
+	tgid, ok := cm.l.containerRootTGIDs[e.CID]
+	cm.l.mu.Unlock()
+	if !ok {
+		return fmt.Errorf("cannot exec in container %q: no such container", e.CID)
+	}
+	t := cm.l.k.TaskSet().Root.TaskWithID(kernel.ThreadID(tgid))
+	if t == nil {
+		return fmt.Errorf("cannot exec in container %q: no thread group with ID %d", e.CID, tgid)
+	}
+	t.WithMuLocked(func(t *kernel.Task) {
+		e.Root = t.FSContext().RootDirectory()
+	})
+	if e.Root != nil {
+		defer e.Root.DecRef()
 	}
 
 	proc := control.Proc{Kernel: cm.l.k}
-	if err := proc.Exec(e, waitStatus); err != nil {
+	if err := proc.Exec(&e.ExecArgs, waitStatus); err != nil {
 		return fmt.Errorf("error executing: %+v: %v", e, err)
 	}
 	return nil
diff --git a/runsc/boot/fs.go b/runsc/boot/fs.go
index 3df276170..5ec9a7d03 100644
--- a/runsc/boot/fs.go
+++ b/runsc/boot/fs.go
@@ -16,7 +16,6 @@ package boot
 
 import (
 	"fmt"
-	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -683,64 +682,11 @@ func setFileSystemForProcess(procArgs *kernel.CreateProcessArgs, spec *specs.Spe
 	return nil
 }
 
-// getExecutablePath traverses the *container's* filesystem to resolve exec's
-// absolute path. For example, if the container is being served files by the
-// fsgofer serving /foo/bar as the container root, it will search within
-// /foo/bar, not the host root.
-// TODO: Unit test this.
-func getExecutablePath(ctx context.Context, mns *fs.MountNamespace, filename string, env []string) (string, error) {
-	exec := filepath.Clean(filename)
-
-	// Don't search PATH if exec is a path to a file (absolute or relative).
-	if strings.IndexByte(exec, '/') >= 0 {
-		return exec, nil
-	}
-
-	// Search the PATH for a file whose name matches the one we are looking
-	// for.
-	pathDirs := specutils.GetPath(env)
-	for _, p := range pathDirs {
-		// Try to find the binary inside path p.
-		binPath := path.Join(p, filename)
-		root := fs.RootFromContext(ctx)
-		defer root.DecRef()
-		d, err := mns.FindInode(ctx, root, nil, binPath, linux.MaxSymlinkTraversals)
-		if err == syserror.ENOENT || err == syserror.EACCES {
-			continue
-		}
-		if err != nil {
-			return "", fmt.Errorf("FindInode(%q) failed: %v", binPath, err)
-		}
-		defer d.DecRef()
-
-		// Check whether we can read and execute the found file.
-		if err := d.Inode.CheckPermission(ctx, fs.PermMask{Read: true, Execute: true}); err != nil {
-			log.Infof("Found executable at %q, but user cannot execute it: %v", binPath, err)
-			continue
-		}
-		return path.Join("/", p, exec), nil
-	}
-
-	return "", fmt.Errorf("could not find executable %q in path %v", exec, pathDirs)
-}
-
 // setExecutablePath sets the procArgs.Filename by searching the PATH for an
 // executable matching the procArgs.Argv[0].
 func setExecutablePath(ctx context.Context, mns *fs.MountNamespace, procArgs *kernel.CreateProcessArgs) error {
-	if procArgs.Filename != "" {
-		// Sanity check.
-		if !path.IsAbs(procArgs.Filename) {
-			return fmt.Errorf("filename must be absolute: %q", procArgs.Filename)
-		}
-		// Nothing to set.
-		return nil
-	}
-
-	if len(procArgs.Argv) == 0 {
-		return fmt.Errorf("Argv must not be empty")
-	}
-
-	f, err := getExecutablePath(ctx, mns, procArgs.Argv[0], procArgs.Envv)
+	paths := fs.GetPath(procArgs.Envv)
+	f, err := mns.ResolveExecutablePath(ctx, procArgs.WorkingDirectory, procArgs.Argv[0], paths)
 	if err != nil {
 		return err
 	}
diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go
index 697210669..f272496a1 100644
--- a/runsc/sandbox/sandbox.go
+++ b/runsc/sandbox/sandbox.go
@@ -187,11 +187,16 @@ func (s *Sandbox) Execute(cid string, e *control.ExecArgs) (syscall.WaitStatus,
 	}
 	defer conn.Close()
 
+	ea := &boot.ExecArgs{
+		ExecArgs: *e,
+		CID:      cid,
+	}
+
 	// Send a message to the sandbox control server to start the container.
 	var waitStatus uint32
 	// TODO: Pass in the container id (cid) here. The sandbox
 	// should execute in the context of that container.
-	if err := conn.Call(boot.ContainerExecute, e, &waitStatus); err != nil {
+	if err := conn.Call(boot.ContainerExecute, ea, &waitStatus); err != nil {
 		return 0, fmt.Errorf("error executing in sandbox: %v", err)
 	}
 
diff --git a/runsc/specutils/specutils.go b/runsc/specutils/specutils.go
index f3fa8d129..fdc9007e0 100644
--- a/runsc/specutils/specutils.go
+++ b/runsc/specutils/specutils.go
@@ -163,18 +163,6 @@ func ReadSpecFromFile(bundleDir string, specFile *os.File) (*specs.Spec, error)
 	return &spec, nil
 }
 
-// GetPath returns the PATH as a slice of strings given the environemnt
-// variables.
-func GetPath(env []string) []string {
-	const prefix = "PATH="
-	for _, e := range env {
-		if strings.HasPrefix(e, prefix) {
-			return strings.Split(strings.TrimPrefix(e, prefix), ":")
-		}
-	}
-	return nil
-}
-
 // Capabilities takes in spec and returns a TaskCapabilities corresponding to
 // the spec.
 func Capabilities(specCaps *specs.LinuxCapabilities) (*auth.TaskCapabilities, error) {