netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add custom error type for ResolveExecutablePath.

Browse Source 
PiperOrigin-RevId: 477058661
This commit is contained in:
Etienne Perot
2022-09-26 20:05:11 -07:00
committed by gVisor bot
parent 68fd6aba43
commit 77d8b6cd77
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/fs/user/path.go
+7 -2
View File
@@ -30,8 +30,13 @@ import (
"gvisor.dev/gvisor/pkg/sentry/vfs"
)
// ExecutableResolveError represents a failure to resolve the executable
// in ResolveExecutablePath.
type ExecutableResolveError error
// ResolveExecutablePath resolves the given executable name given the working
// dir and environment.
// Returns ExecutableResolveError when the executable cannot be resolved.
func ResolveExecutablePath(ctx context.Context, args *kernel.CreateProcessArgs) (string, error) {
name := args.Filename
if len(name) == 0 {
@@ -64,14 +69,14 @@ func ResolveExecutablePath(ctx context.Context, args *kernel.CreateProcessArgs)
if kernel.VFS2Enabled {
f, err := resolveVFS2(ctx, args.Credentials, args.MountNamespaceVFS2, paths, name)
if err != nil {
return "", fmt.Errorf("error finding executable %q in PATH %v: %v", name, paths, err)
return "", ExecutableResolveError(fmt.Errorf("error finding executable %q in PATH %v: %v", name, paths, err))
}
return f, nil
}
f, err := resolve(ctx, args.MountNamespace, paths, name)
if err != nil {
return "", fmt.Errorf("error finding executable %q in PATH %v: %v", name, paths, err)
return "", ExecutableResolveError(fmt.Errorf("error finding executable %q in PATH %v: %v", name, paths, err))
}
return f, nil
}