diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-07-13 22:49:25 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-13 22:49:25 +0000 |
| commit | 9ed48ff2523937ded7184597a9f61bab4bb084e8 (patch) | |
| tree | 27d6d5b35687e2f83233897b36a7cf172fb62681 /pkg/sentry/vfs | |
| parent | a59f2ea88b9cb4be998fc282fc4c233f2f9f593d (diff) | |
| parent | d4dce953b7ac4705f5b52ac24c031170d701031b (diff) | |
Merge release-20210705.0-20-gd4dce953b (automated)
Diffstat (limited to 'pkg/sentry/vfs')
| -rw-r--r-- | pkg/sentry/vfs/vfs.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkg/sentry/vfs/vfs.go b/pkg/sentry/vfs/vfs.go index aeca262e3..eb3c60610 100644 --- a/pkg/sentry/vfs/vfs.go +++ b/pkg/sentry/vfs/vfs.go @@ -427,9 +427,7 @@ func (vfs *VirtualFilesystem) OpenAt(ctx context.Context, creds *auth.Credential if opts.Flags&linux.O_DIRECTORY != 0 { rp.mustBeDir = true } - // Ignore O_PATH for verity, as verity performs extra operations on the fd for verification. - // The underlying filesystem that verity wraps opens the fd with O_PATH. - if opts.Flags&linux.O_PATH != 0 && rp.mount.fs.FilesystemType().Name() != "verity" { + if opts.Flags&linux.O_PATH != 0 { vd, err := vfs.GetDentryAt(ctx, creds, pop, &GetDentryOptions{}) if err != nil { return nil, err |