From de7c2164d7907aff59aa0b40b309ed30057d632f Mon Sep 17 00:00:00 2001
From: Ayush Ranjan <ayushranjan@google.com>
Date: Fri, 23 Sep 2022 10:43:46 -0700
Subject: [PATCH] Allow O_DIRECT with gofer.specialFileFD that represent
 regular files.

gofer.specialFileFD can sometimes represent regular files. O_DIRECT
is expected to be supported there.

PiperOrigin-RevId: 476408649
---
 pkg/sentry/fsimpl/gofer/filesystem.go   | 2 +-
 pkg/sentry/fsimpl/gofer/special_file.go | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/sentry/fsimpl/gofer/filesystem.go b/pkg/sentry/fsimpl/gofer/filesystem.go
index aecd652bb..3e5e077e3 100644
--- a/pkg/sentry/fsimpl/gofer/filesystem.go
+++ b/pkg/sentry/fsimpl/gofer/filesystem.go
@@ -1255,7 +1255,7 @@ func (d *dentry) openSocketByConnecting(ctx context.Context, opts *vfs.OpenOptio
 
 func (d *dentry) openSpecialFile(ctx context.Context, mnt *vfs.Mount, opts *vfs.OpenOptions) (*vfs.FileDescription, error) {
 	ats := vfs.AccessTypesForOpenFlags(opts)
-	if opts.Flags&linux.O_DIRECT != 0 {
+	if opts.Flags&linux.O_DIRECT != 0 && !d.isRegularFile() {
 		return nil, linuxerr.EINVAL
 	}
 	// We assume that the server silently inserts O_NONBLOCK in the open flags
diff --git a/pkg/sentry/fsimpl/gofer/special_file.go b/pkg/sentry/fsimpl/gofer/special_file.go
index 7336eaf11..9a6e480a7 100644
--- a/pkg/sentry/fsimpl/gofer/special_file.go
+++ b/pkg/sentry/fsimpl/gofer/special_file.go
@@ -108,8 +108,9 @@ func newSpecialFileFD(h handle, mnt *vfs.Mount, d *dentry, flags uint32) (*speci
 		}
 	}
 	if err := fd.vfsfd.Init(fd, flags, mnt, &d.vfsd, &vfs.FileDescriptionOptions{
-		DenyPRead:  !seekable,
-		DenyPWrite: !seekable,
+		AllowDirectIO: true,
+		DenyPRead:     !seekable,
+		DenyPWrite:    !seekable,
 	}); err != nil {
 		if haveQueue {
 			fdnotifier.RemoveFD(h.fd)