From d93d19fd4eefdfd868919a73c9498e7da7eb9258 Mon Sep 17 00:00:00 2001 From: Nicolas Lacasse Date: Wed, 10 Apr 2019 16:35:22 -0700 Subject: Fix uses of RootFromContext. RootFromContext can return a dirent with reference taken, or nil. We must call DecRef if (and only if) a real dirent is returned. PiperOrigin-RevId: 242965515 Change-Id: Ie2b7b4cb19ee09b6ccf788b71f3fd7efcdf35a11 --- pkg/sentry/fs/ramfs/dir.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkg/sentry/fs/ramfs') diff --git a/pkg/sentry/fs/ramfs/dir.go b/pkg/sentry/fs/ramfs/dir.go index 05d716afb..a3b33c0f8 100644 --- a/pkg/sentry/fs/ramfs/dir.go +++ b/pkg/sentry/fs/ramfs/dir.go @@ -417,7 +417,9 @@ func (dfo *dirFileOperations) IterateDir(ctx context.Context, dirCtx *fs.DirCtx, // Readdir implements FileOperations.Readdir. func (dfo *dirFileOperations) Readdir(ctx context.Context, file *fs.File, serializer fs.DentrySerializer) (int64, error) { root := fs.RootFromContext(ctx) - defer root.DecRef() + if root != nil { + defer root.DecRef() + } dirCtx := &fs.DirCtx{ Serializer: serializer, DirCursor: &dfo.dirCursor, -- cgit v1.2.3