summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fsimpl/overlay/copy_up.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-11-06 21:18:18 +0000
committergVisor bot <gvisor-bot@google.com>2020-11-06 21:18:18 +0000
commitee435928e3fb01146cf8f749ba0cec94fd75d0e8 (patch)
treeb4a209dec8acb36dfa5169e4d7db21028fc1e828 /pkg/sentry/fsimpl/overlay/copy_up.go
parentad0d64d3307cf2a9fdca458f32288dcd645a7f1a (diff)
parent949dc1d096aa9ac58c73cc861b95c8172d82dfcd (diff)
Merge release-20201030.0-43-g949dc1d09 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/overlay/copy_up.go')
-rw-r--r--pkg/sentry/fsimpl/overlay/copy_up.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/fsimpl/overlay/copy_up.go b/pkg/sentry/fsimpl/overlay/copy_up.go
index 4506642ca..469f3a33d 100644
--- a/pkg/sentry/fsimpl/overlay/copy_up.go
+++ b/pkg/sentry/fsimpl/overlay/copy_up.go
@@ -409,7 +409,7 @@ func (d *dentry) copyUpDescendantsLocked(ctx context.Context, ds **[]*dentry) er
if dirent.Name == "." || dirent.Name == ".." {
continue
}
- child, err := d.fs.getChildLocked(ctx, d, dirent.Name, ds)
+ child, _, err := d.fs.getChildLocked(ctx, d, dirent.Name, ds)
if err != nil {
return err
}