Merge pull request google#5 from craig08/fuse-readdir-fix-offset

boyuan-he · web-flow · commit b939b6e5eb04 · 2020-08-20T10:51:42.000-07:00
fuse: Fix FUSE_READDIR offset issue
diff --git a/pkg/sentry/fsimpl/fuse/directory.go b/pkg/sentry/fsimpl/fuse/directory.go
@@ -87,7 +87,7 @@ func (dir *directoryFD) IterDirents(ctx context.Context, callback vfs.IterDirent
 	}
 
 	for _, fuseDirent := range out.Dirents {
-		nextOff := int64(fuseDirent.Meta.Off) + 1
+		nextOff := int64(fuseDirent.Meta.Off)
 		dirent := vfs.Dirent{
 			Name:    fuseDirent.Name,
 			Type:    uint8(fuseDirent.Meta.Type),

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func (dir *directoryFD) IterDirents(ctx context.Context, callback vfs.IterDirent`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`for _, fuseDirent := range out.Dirents {`
`90`		`- nextOff := int64(fuseDirent.Meta.Off) + 1`
	`90`	`+ nextOff := int64(fuseDirent.Meta.Off)`
`91`	`91`	`dirent := vfs.Dirent{`
`92`	`92`	`Name: fuseDirent.Name,`
`93`	`93`	`Type: uint8(fuseDirent.Meta.Type),`