diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-04-03 04:15:14 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-04-03 04:15:14 +0000 |
| commit | 0e1d141ffcf7878ff60a3ed1f1c696ecfa8d099e (patch) | |
| tree | 9755d118b4801cb9743df8617128888ab06470e4 /pkg/sentry/fsimpl/proc/filesystem.go | |
| parent | 3dee9c57344555ab56d44c18c2b9f7c667d2d593 (diff) | |
| parent | 932c8abd0f739bec295ff62cf8fce3dcb7e2d866 (diff) | |
Merge release-20210322.0-38-g932c8abd0 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/proc/filesystem.go')
| -rw-r--r-- | pkg/sentry/fsimpl/proc/filesystem.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/fsimpl/proc/filesystem.go b/pkg/sentry/fsimpl/proc/filesystem.go index 254a8b062..ce8f55b1f 100644 --- a/pkg/sentry/fsimpl/proc/filesystem.go +++ b/pkg/sentry/fsimpl/proc/filesystem.go @@ -86,13 +86,13 @@ func (ft FilesystemType) GetFilesystem(ctx context.Context, vfsObj *vfs.VirtualF procfs.MaxCachedDentries = maxCachedDentries procfs.VFSFilesystem().Init(vfsObj, &ft, procfs) - var cgroups map[string]string + var fakeCgroupControllers map[string]string if opts.InternalData != nil { data := opts.InternalData.(*InternalData) - cgroups = data.Cgroups + fakeCgroupControllers = data.Cgroups } - inode := procfs.newTasksInode(ctx, k, pidns, cgroups) + inode := procfs.newTasksInode(ctx, k, pidns, fakeCgroupControllers) var dentry kernfs.Dentry dentry.InitRoot(&procfs.Filesystem, inode) return procfs.VFSFilesystem(), dentry.VFSDentry(), nil |