diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-11-13 07:05:39 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-11-13 07:05:39 +0000 |
| commit | d1aaccdccc731a943836e65a6e009382595317e7 (patch) | |
| tree | ef5a523aec53bc8b80b6b862174c96998d19f681 /pkg/sentry | |
| parent | 5e019932cd5ff2bd0d463485dc8c7c28d2367cd5 (diff) | |
| parent | c2d3dc0c13e1adfc182c33d57e410c46fe12415f (diff) | |
Merge release-20191104.0-36-gc2d3dc0 (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/fs/inode_overlay.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/sentry/fs/inode_overlay.go b/pkg/sentry/fs/inode_overlay.go index 5a388dad1..a09147080 100644 --- a/pkg/sentry/fs/inode_overlay.go +++ b/pkg/sentry/fs/inode_overlay.go @@ -462,7 +462,9 @@ func overlayBind(ctx context.Context, o *overlayEntry, parent *Dirent, name stri inode.DecRef() return nil, err } - return NewDirent(ctx, newOverlayInode(ctx, entry, inode.MountSource), name), nil + // Use the parent's MountSource, since that corresponds to the overlay, + // and not the upper filesystem. + return NewDirent(ctx, newOverlayInode(ctx, entry, parent.Inode.MountSource), name), nil } func overlayBoundEndpoint(o *overlayEntry, path string) transport.BoundEndpoint { |