diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-07-09 00:14:56 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-07-09 00:14:56 +0000 |
| commit | 61659491473d258a9e6ac658f8906ee5441b1d3a (patch) | |
| tree | 72edb742245888533e83eb818d22e1861eb118fa /pkg | |
| parent | 1faf4e5c1e9d14fcff758a60328ff4eb7fbee0de (diff) | |
| parent | c4815af9475cc4680c6d598d9c930de892c98aae (diff) | |
Merge release-20200622.1-85-gc4815af94 (automated)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/sentry/loader/loader.go | 4 | ||||
| -rw-r--r-- | pkg/sentry/vfs/vfs.go | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkg/sentry/loader/loader.go b/pkg/sentry/loader/loader.go index e65ec4771..986c7fb4d 100644 --- a/pkg/sentry/loader/loader.go +++ b/pkg/sentry/loader/loader.go @@ -221,14 +221,14 @@ func Load(ctx context.Context, args LoadArgs, extraAuxv []arch.AuxEntry, vdso *V // Load the executable itself. loaded, ac, file, newArgv, err := loadExecutable(ctx, args) if err != nil { - return 0, nil, "", syserr.NewDynamic(fmt.Sprintf("Failed to load %s: %v", args.Filename, err), syserr.FromError(err).ToLinux()) + return 0, nil, "", syserr.NewDynamic(fmt.Sprintf("failed to load %s: %v", args.Filename, err), syserr.FromError(err).ToLinux()) } defer file.DecRef() // Load the VDSO. vdsoAddr, err := loadVDSO(ctx, args.MemoryManager, vdso, loaded) if err != nil { - return 0, nil, "", syserr.NewDynamic(fmt.Sprintf("Error loading VDSO: %v", err), syserr.FromError(err).ToLinux()) + return 0, nil, "", syserr.NewDynamic(fmt.Sprintf("error loading VDSO: %v", err), syserr.FromError(err).ToLinux()) } // Setup the heap. brk starts at the next page after the end of the diff --git a/pkg/sentry/vfs/vfs.go b/pkg/sentry/vfs/vfs.go index 58c7ad778..522e27475 100644 --- a/pkg/sentry/vfs/vfs.go +++ b/pkg/sentry/vfs/vfs.go @@ -123,6 +123,9 @@ type VirtualFilesystem struct { // Init initializes a new VirtualFilesystem with no mounts or FilesystemTypes. func (vfs *VirtualFilesystem) Init() error { + if vfs.mountpoints != nil { + panic("VFS already initialized") + } vfs.mountpoints = make(map[*Dentry]map[*Mount]struct{}) vfs.devices = make(map[devTuple]*registeredDevice) vfs.anonBlockDevMinorNext = 1 |