diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-11-25 23:24:27 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-11-25 23:24:27 +0000 |
| commit | 11b3c62c47beed4fd8f40177d06f3252fc641a08 (patch) | |
| tree | 05a0de5ea9d91b0bfd19c5e35c05982155a5ae43 /pkg/sentry/vfs/resolving_path.go | |
| parent | 7a75c931295a2c9906c91fc704fd333bc5303a2c (diff) | |
| parent | 128948d6ae94009c6ad13a0bd96e03e45a560477 (diff) | |
Merge release-20191114.0-34-g128948d (automated)
Diffstat (limited to 'pkg/sentry/vfs/resolving_path.go')
| -rwxr-xr-x | pkg/sentry/vfs/resolving_path.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/sentry/vfs/resolving_path.go b/pkg/sentry/vfs/resolving_path.go index 8d05c8583..61bce6426 100755 --- a/pkg/sentry/vfs/resolving_path.go +++ b/pkg/sentry/vfs/resolving_path.go @@ -269,11 +269,11 @@ func (rp *ResolvingPath) ResolveParent(d *Dentry) (*Dentry, error) { parent = d } else if d == rp.mount.root { // At mount root ... - mnt, mntpt := rp.vfs.getMountpointAt(rp.mount, rp.root) - if mnt != nil { + vd := rp.vfs.getMountpointAt(rp.mount, rp.root) + if vd.Ok() { // ... of non-root mount. - rp.nextMount = mnt - rp.nextStart = mntpt + rp.nextMount = vd.mount + rp.nextStart = vd.dentry return nil, resolveMountRootError{} } // ... of root mount. |