From 700014c960df86707bd8ddb907eeaf210b31e208 Mon Sep 17 00:00:00 2001 From: Rahat Mahmood Date: Thu, 12 May 2022 16:09:27 -0700 Subject: [PATCH] cgroupfs: Allow explicit "/" as initial cgroup. PiperOrigin-RevId: 448361452 --- pkg/sentry/fsimpl/cgroupfs/cgroupfs.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/sentry/fsimpl/cgroupfs/cgroupfs.go b/pkg/sentry/fsimpl/cgroupfs/cgroupfs.go index c3423e06f..d65c1fd49 100644 --- a/pkg/sentry/fsimpl/cgroupfs/cgroupfs.go +++ b/pkg/sentry/fsimpl/cgroupfs/cgroupfs.go @@ -364,10 +364,14 @@ func (fs *filesystem) prepareInitialCgroup(ctx context.Context, vfsObj *vfs.Virt } ctx.Debugf("cgroupfs.FilesystemType.GetFilesystem: initial cgroup path: %v", initPathStr) initPath := fspath.Parse(initPathStr) - if !initPath.Absolute || !initPath.HasComponents() { + if !initPath.Absolute { ctx.Warningf("cgroupfs.FilesystemType.GetFilesystem: initial cgroup path invalid: %+v", initPath) return linuxerr.EINVAL } + if !initPath.HasComponents() { + // Explicit "/" as initial cgroup, nothing to do. + return nil + } ownerCreds := auth.CredentialsFromContext(ctx).Fork() if idata.InitialCgroup.SetOwner {