diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-10-13 18:34:42 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-10-13 18:34:42 +0000 |
commit | ce89079990c8cd8a42ee675c7a5fd310c7fdd8de (patch) | |
tree | 6a7e204ac962705fabb545c531340e6098b6e503 /pkg/sentry/fs | |
parent | 5846738e7bdaf2d9638d51a330d9306f856af6d7 (diff) | |
parent | 432963dd2d9f4797f26a8b2555464a50f8319537 (diff) |
Merge release-20200928.0-102-g432963dd2 (automated)
Diffstat (limited to 'pkg/sentry/fs')
-rw-r--r-- | pkg/sentry/fs/user/path.go | 1 | ||||
-rw-r--r-- | pkg/sentry/fs/user/user.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkg/sentry/fs/user/path.go b/pkg/sentry/fs/user/path.go index 2f5a43b84..124bc95ed 100644 --- a/pkg/sentry/fs/user/path.go +++ b/pkg/sentry/fs/user/path.go @@ -121,6 +121,7 @@ func resolve(ctx context.Context, mns *fs.MountNamespace, paths []string, name s func resolveVFS2(ctx context.Context, creds *auth.Credentials, mns *vfs.MountNamespace, paths []string, name string) (string, error) { root := mns.Root() + root.IncRef() defer root.DecRef(ctx) for _, p := range paths { if !path.IsAbs(p) { diff --git a/pkg/sentry/fs/user/user.go b/pkg/sentry/fs/user/user.go index 936fd3932..1f8684dc6 100644 --- a/pkg/sentry/fs/user/user.go +++ b/pkg/sentry/fs/user/user.go @@ -105,6 +105,7 @@ func getExecUserHomeVFS2(ctx context.Context, mns *vfs.MountNamespace, uid auth. const defaultHome = "/" root := mns.Root() + root.IncRef() defer root.DecRef(ctx) creds := auth.CredentialsFromContext(ctx) |