Merge ab6774ce (automated)

1 files changed, 10 insertions, 3 deletions

diff --git a/pkg/sentry/fs/dirent.go b/pkg/sentry/fs/dirent.go
index ca417d2bc..3cba259d9 100644
--- a/pkg/sentry/fs/dirent.go
+++ b/pkg/sentry/fs/dirent.go
@@ -948,9 +948,6 @@ func direntReaddir(ctx context.Context, d *Dirent, it DirIterator, root *Dirent,
 	if dirCtx.Serializer == nil {
 		panic("Dirent.Readdir: serializer must not be nil")
 	}
-	if d.frozen {
-		return d.readdirFrozen(root, offset, dirCtx)
-	}
 
 	// Check that this is actually a directory before emitting anything.
 	// Once we have written entries for "." and "..", future errors from
@@ -959,6 +956,16 @@ func direntReaddir(ctx context.Context, d *Dirent, it DirIterator, root *Dirent,
 		return 0, syserror.ENOTDIR
 	}
 
+	// This is a special case for lseek(fd, 0, SEEK_END).
+	// See SeekWithDirCursor for more details.
+	if offset == FileMaxOffset {
+		return offset, nil
+	}
+
+	if d.frozen {
+		return d.readdirFrozen(root, offset, dirCtx)
+	}
+
 	// Collect attrs for "." and "..".
 	dot, dotdot := d.GetDotAttrs(root)