Skip to content

Prevent out-of-range slices in MigrationStorage #959

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

Open
roger2hk wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −0
Open

Prevent out-of-range slices in MigrationStorage #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e85407
Prevent out-of-range slices in MigrationStorage
roger2hk May 13, 2026
016040f
Address comment
roger2hk May 14, 2026
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
3 changes: 3 additions & 0 deletions storage/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,9 @@ func (m *MigrationStorage) fetchLeafHashes(ctx context.Context, from, to, source
if err != nil {
return fmt.Errorf("bundleHasherFunc for bundle index %d: %v", ri.Index, err)
}
if l := len(bh); l < int(ri.First+ri.N) {
return fmt.Errorf("bundle index %d has fewer entries than expected (%d < %d)", ri.Index, l, ri.First+ri.N)
}
toBeAdded.Store(ri.Index, bh[ri.First:ri.First+ri.N])
return nil
})
Expand Down
3 changes: 3 additions & 0 deletions storage/gcp/gcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,6 +1535,9 @@ func (m *MigrationStorage) fetchLeafHashes(ctx context.Context, from, to, source
if err != nil {
return fmt.Errorf("bundleHasherFunc for bundle index %d: %v", ri.Index, err)
}
if l := len(bh); l < int(ri.First+ri.N) {
return fmt.Errorf("bundle index %d has fewer entries than expected (%d < %d)", ri.Index, l, ri.First+ri.N)
}
toBeAdded.Store(ri.Index, bh[ri.First:ri.First+ri.N])
return nil
})
Expand Down
3 changes: 3 additions & 0 deletions storage/posix/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,9 @@ func (m *MigrationStorage) fetchLeafHashes(ctx context.Context, from, to, source
if err != nil {
return nil, fmt.Errorf("bundleHasherFunc for bundle index %d: %v", ri.Index, err)
}
if l := len(bh); l < int(ri.First+ri.N) {
return nil, fmt.Errorf("bundle index %d has fewer entries than expected (%d < %d)", ri.Index, l, ri.First+ri.N)
}
lh = append(lh, bh[ri.First:ri.First+ri.N]...)
n++
if n >= maxBundles {
Expand Down
Loading