diff options
| author | Kevin Krakauer <krakauer@google.com> | 2019-04-26 11:08:37 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-04-26 11:09:55 -0700 |
| commit | 5f13338d30fb59241cf7f1aa6374c54c69677314 (patch) | |
| tree | f56328cb60ebe16a337a555c381d87db8c287442 /pkg/sentry | |
| parent | f4d34b420bd30b9c3725f9247c9145808aab0ffb (diff) | |
Fix reference counting bug in /proc/PID/fdinfo/.
PiperOrigin-RevId: 245452217
Change-Id: I7164d8f57fe34c17e601079eb9410a6d95af1869
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/fs/proc/fds.go | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/pkg/sentry/fs/proc/fds.go b/pkg/sentry/fs/proc/fds.go index 939ebaba1..25da06f5d 100644 --- a/pkg/sentry/fs/proc/fds.go +++ b/pkg/sentry/fs/proc/fds.go @@ -236,24 +236,6 @@ func (f *fdDirFile) Readdir(ctx context.Context, file *fs.File, ser fs.DentrySer }) } -// fdInfoInode is a single file in /proc/TID/fdinfo/. -// -// +stateify savable -type fdInfoInode struct { - staticFileInodeOps - - file *fs.File - flags fs.FileFlags - fdFlags kernel.FDFlags -} - -var _ fs.InodeOperations = (*fdInfoInode)(nil) - -// Release implements fs.InodeOperations.Release. -func (f *fdInfoInode) Release(ctx context.Context) { - f.file.DecRef() -} - // fdInfoDir implements /proc/TID/fdinfo. It embeds an fdDir, but overrides // Lookup and Readdir. // @@ -283,6 +265,7 @@ func (fdid *fdInfoDir) Lookup(ctx context.Context, dir *fs.Inode, p string) (*fs // locks, and other data. For now we only have flags. // See https://www.kernel.org/doc/Documentation/filesystems/proc.txt flags := file.Flags().ToLinux() | fdFlags.ToLinuxFileFlags() + file.DecRef() contents := []byte(fmt.Sprintf("flags:\t0%o\n", flags)) return newStaticProcInode(ctx, dir.MountSource, contents) }) |