summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fs/inode_overlay.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-03-31 22:15:49 +0000
committergVisor bot <gvisor-bot@google.com>2020-03-31 22:15:49 +0000
commit6e88232d9f353f66e0032c41278674b8d4bcd560 (patch)
tree91b308e7c3101a8a47480a458858a30ed0ccbca4 /pkg/sentry/fs/inode_overlay.go
parent30333ec5be7442942456110f8ace45e0b867055d (diff)
parentb6639f77e59d885cb092c15a7a0c5a988e149b40 (diff)
Merge release-20200323.0-41-gb6639f7 (automated)
Diffstat (limited to 'pkg/sentry/fs/inode_overlay.go')
-rw-r--r--pkg/sentry/fs/inode_overlay.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/fs/inode_overlay.go b/pkg/sentry/fs/inode_overlay.go
index 5ada33a32..537c8d257 100644
--- a/pkg/sentry/fs/inode_overlay.go
+++ b/pkg/sentry/fs/inode_overlay.go
@@ -231,7 +231,8 @@ func overlayCreate(ctx context.Context, o *overlayEntry, parent *Dirent, name st
upperFile.Dirent.Inode.IncRef()
entry, err := newOverlayEntry(ctx, upperFile.Dirent.Inode, nil, false)
if err != nil {
- cleanupUpper(ctx, o.upper, name)
+ werr := fmt.Errorf("newOverlayEntry failed: %v", err)
+ cleanupUpper(ctx, o.upper, name, werr)
return nil, err
}