Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vfs: skip unresolved mount promises in procfs #11081

Merged
merged 1 commit into from
Nov 1, 2024
Merged

vfs: skip unresolved mount promises in procfs #11081

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions pkg/sentry/vfs/mount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,17 +1366,20 @@ func (vfs *VirtualFilesystem) GenerateProcMounts(ctx context.Context, taskRootDi
mount: mnt,
dentry: mnt.root,
}
if mp := vfs.getMountPromise(mntRootVD); mp != nil && !mp.resolved.Load() {
// Skip unresolved mount promises for consistency with
// GenerateProcMountInfo.
continue
}
path, err := vfs.PathnameReachable(ctx, taskRootDir, mntRootVD)
if err != nil {
// For some reason we didn't get a path. Log a warning
// and run with empty path.
// For some reason we didn't get a path.
ctx.Warningf("VFS.GenerateProcMounts: error getting pathname for mount root: %v", err)
path = ""
continue
}
if path == "" {
// Either an error occurred, or path is not reachable
// from root.
break
// The path is not reachable from root.
continue
}

mntOpts := mnt.Options()
Expand Down Expand Up @@ -1433,10 +1436,14 @@ func (vfs *VirtualFilesystem) GenerateProcMountInfo(ctx context.Context, taskRoo
mount: mnt,
dentry: mnt.root,
}
if mp := vfs.getMountPromise(mntRootVD); mp != nil && !mp.resolved.Load() {
// Skip unresolved mount promises to prevent mounters from
// deadlocking by reading /proc/*/mountinfo.
continue
}
pathFromRoot, err := vfs.PathnameReachable(ctx, taskRootDir, mntRootVD)
if err != nil {
// For some reason we didn't get a path. Log a warning
// and run with empty path.
// For some reason we didn't get a path.
ctx.Warningf("VFS.GenerateProcMountInfo: error getting pathname for mount root: %v", err)
continue
}
Expand Down
Loading