diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-10-02 20:32:05 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-10-02 20:32:05 +0000 |
| commit | 8320adcf4495e4da40a0b53ead8db14cf23cdc41 (patch) | |
| tree | 32096ea009b709991bc136e7bdd6c1775bc14b18 /pkg/sentry/fs | |
| parent | 09b851bfa19d94cf6b34bc37e0994ab0e052efcb (diff) | |
| parent | 2016cc283cbdfc1a49cca86f6c160724ee4d0cbd (diff) | |
Merge release-20190806.1-228-g2016cc2 (automated)
Diffstat (limited to 'pkg/sentry/fs')
| -rw-r--r-- | pkg/sentry/fs/proc/proc.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/fs/proc/proc.go b/pkg/sentry/fs/proc/proc.go index 0ef13f2f5..56e92721e 100644 --- a/pkg/sentry/fs/proc/proc.go +++ b/pkg/sentry/fs/proc/proc.go @@ -230,7 +230,7 @@ func (rpf *rootProcFile) Readdir(ctx context.Context, file *fs.File, ser fs.Dent // But for whatever crazy reason, you can still walk to the given node. for _, tg := range rpf.iops.pidns.ThreadGroups() { if leader := tg.Leader(); leader != nil { - name := strconv.FormatUint(uint64(tg.ID()), 10) + name := strconv.FormatUint(uint64(rpf.iops.pidns.IDOfThreadGroup(tg)), 10) m[name] = fs.GenericDentAttr(fs.SpecialDirectory, device.ProcDevice) names = append(names, name) } |