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.

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

tmpfs: limit regularFile.Translate() fill range #11343

Merged
merged 1 commit into from
Jan 8, 2025
Merged
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions pkg/sentry/fsimpl/tmpfs/regular_file.go
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,19 @@ func (rf *regularFile) Translate(ctx context.Context, required, optional memmap.
if optional.End > pgend {
optional.End = pgend
}
// Constrain allocation to at most maxOptionalBytes or required.Length(),
// whichever is greater.
const maxOptionalBytes = 64 << 10 // 64 KB, arbitrarily matches Linux's default fault_around_pages
if required.Length() >= maxOptionalBytes {
optional = required
} else {
if optional.Length() > maxOptionalBytes {
optional.Start = required.Start
if optional.Length() > maxOptionalBytes {
optional.End = optional.Start + maxOptionalBytes
}
}
}
pagesToFill := rf.data.PagesToFill(required, optional)
if !rf.inode.fs.accountPages(pagesToFill) {
// If we can not accommodate pagesToFill pages, then retry with just
Expand Down
Loading