diff options
| author | Nicolas Lacasse <nlacasse@google.com> | 2019-04-10 16:35:22 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-04-10 16:36:28 -0700 |
| commit | d93d19fd4eefdfd868919a73c9498e7da7eb9258 (patch) | |
| tree | 79add4ec602cae3a44b551daca485ae3766e6f0b /pkg/sentry/fs/ramfs/dir.go | |
| parent | c8368e477b8f2dedaadacbd6efbb455879c9b1d6 (diff) | |
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
Diffstat (limited to 'pkg/sentry/fs/ramfs/dir.go')
| -rw-r--r-- | pkg/sentry/fs/ramfs/dir.go | 4 |
1 files changed, 3 insertions, 1 deletions
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, |