diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-02-06 17:07:04 -0800 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-02-06 17:07:04 -0800 |
| commit | d98287f5eb40a9c91668b7511824c05d542e0599 (patch) | |
| tree | f8430747db6e1c02fe0eb45a7dad0899d06bd072 /pkg/sentry/fs | |
| parent | bf0ea204e9415a181c63ee10078cca753df14f7e (diff) | |
| parent | 16561e461e82f8d846ef1f3ada990270ef39ccc6 (diff) | |
Merge branch 'master' into tcp-matchers-submit
Diffstat (limited to 'pkg/sentry/fs')
| -rw-r--r-- | pkg/sentry/fs/file_overlay_test.go | 1 | ||||
| -rw-r--r-- | pkg/sentry/fs/proc/README.md | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkg/sentry/fs/file_overlay_test.go b/pkg/sentry/fs/file_overlay_test.go index 02538bb4f..a76d87e3a 100644 --- a/pkg/sentry/fs/file_overlay_test.go +++ b/pkg/sentry/fs/file_overlay_test.go @@ -177,6 +177,7 @@ func TestReaddirRevalidation(t *testing.T) { // TestReaddirOverlayFrozen tests that calling Readdir on an overlay file with // a frozen dirent tree does not make Readdir calls to the underlying files. +// This is a regression test for b/114808269. func TestReaddirOverlayFrozen(t *testing.T) { ctx := contexttest.Context(t) diff --git a/pkg/sentry/fs/proc/README.md b/pkg/sentry/fs/proc/README.md index 5d4ec6c7b..6667a0916 100644 --- a/pkg/sentry/fs/proc/README.md +++ b/pkg/sentry/fs/proc/README.md @@ -11,6 +11,8 @@ inconsistency, please file a bug. The following files are implemented: +<!-- mdformat off(don't wrap the table) --> + | File /proc/ | Content | | :------------------------ | :---------------------------------------------------- | | [cpuinfo](#cpuinfo) | Info about the CPU | @@ -22,6 +24,8 @@ The following files are implemented: | [uptime](#uptime) | Wall clock since boot, combined idle time of all cpus | | [version](#version) | Kernel version | +<!-- mdformat on --> + ### cpuinfo ```bash |