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

validate buffer length prior to calling Uint64 #1588

Merged
merged 8 commits into from
Oct 1, 2024
Merged

validate buffer length prior to calling Uint64 #1588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
49919a7
update
tsachiherman Sep 24, 2024
b484804
restore empty line
tsachiherman Sep 24, 2024
fb246af
linter
tsachiherman Sep 24, 2024
3d04c76
Merge branch 'main' into tsachi/check_buffer_len
tsachiherman Sep 24, 2024
cb1a41c
update per CR
tsachiherman Sep 24, 2024
73bf24d
Merge branch 'tsachi/check_buffer_len' of github.com:ava-labs/hypersd…
tsachiherman Sep 24, 2024
13058ea
rollback redundant changes
tsachiherman Sep 24, 2024
9c5d786
add per CR
tsachiherman Sep 25, 2024
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
17 changes: 14 additions & 3 deletions chain/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"fmt"
"time"

"github.com/ava-labs/avalanchego/database"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/snow/consensus/snowman"
"github.com/ava-labs/avalanchego/snow/engine/snowman/block"
Expand Down Expand Up @@ -426,7 +427,10 @@ func (b *StatefulBlock) innerVerify(ctx context.Context, vctx VerifyContext) err
if err != nil {
return err
}
parentHeight := binary.BigEndian.Uint64(parentHeightRaw)
parentHeight, err := database.ParseUInt64(parentHeightRaw)
if err != nil {
return err
}
if b.Hght != parentHeight+1 {
return ErrInvalidBlockHeight
}
Expand All @@ -440,7 +444,11 @@ func (b *StatefulBlock) innerVerify(ctx context.Context, vctx VerifyContext) err
if err != nil {
return err
}
parentTimestamp := int64(binary.BigEndian.Uint64(parentTimestampRaw))
parentTimestampUint64, err := database.ParseUInt64(parentTimestampRaw)
if err != nil {
return err
}
parentTimestamp := int64(parentTimestampUint64)
if b.Tmstmp < parentTimestamp+r.GetMinBlockGap() {
return ErrTimestampTooEarly
}
Expand Down Expand Up @@ -731,7 +739,10 @@ func (b *StatefulBlock) View(ctx context.Context, verify bool) (state.View, erro
if err != nil {
return nil, err
}
acceptedHeight := binary.BigEndian.Uint64(acceptedHeightRaw)
acceptedHeight, err := database.ParseUInt64(acceptedHeightRaw)
if err != nil {
return nil, err
}
if acceptedHeight == b.Hght {
b.vm.Logger().Info("accepted block not processed but found post-execution state on-disk",
zap.Uint64("height", b.Hght),
Expand Down
6 changes: 5 additions & 1 deletion docs/tutorials/morpheusvm/morpheusvm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,11 @@ func innerGetBalance(
if err != nil {
return 0, false, err
}
return binary.BigEndian.Uint64(v), true, nil
val, err := database.ParseUInt64(v)
if err != nil {
return 0, false, err
}
return val, true, nil
}
```

Expand Down
6 changes: 5 additions & 1 deletion examples/morpheusvm/storage/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,11 @@ func innerGetBalance(
if err != nil {
return 0, false, err
}
return binary.BigEndian.Uint64(v), true, nil
val, err := database.ParseUInt64(v)
if err != nil {
return 0, false, err
}
return val, true, nil
}

func SetBalance(
Expand Down
6 changes: 5 additions & 1 deletion examples/vmwithcontracts/storage/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ func innerGetBalance(
if err != nil {
return 0, false, err
}
return binary.BigEndian.Uint64(v), true, nil
val, err := database.ParseUInt64(v)
if err != nil {
return 0, false, err
}
return val, true, nil
}

func SetBalance(
Expand Down
6 changes: 3 additions & 3 deletions vm/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (vm *VM) GetLastAcceptedHeight() (uint64, error) {
if err != nil {
return 0, err
}
return binary.BigEndian.Uint64(b), nil
return database.ParseUInt64(b)
}

func (vm *VM) SetLastProcessedHeight(height uint64) error {
Expand All @@ -98,7 +98,7 @@ func (vm *VM) GetLastProcessedHeight() (uint64, error) {
if err != nil {
return 0, err
}
return binary.BigEndian.Uint64(b), nil
return database.ParseUInt64(b)
}

func (vm *VM) shouldCompact(expiryHeight uint64) bool {
Expand Down Expand Up @@ -199,7 +199,7 @@ func (vm *VM) GetBlockIDHeight(blkID ids.ID) (uint64, error) {
if err != nil {
return 0, err
}
return binary.BigEndian.Uint64(b), nil
return database.ParseUInt64(b)
}

// CompactDiskBlocks forces compaction on the entire range of blocks up to [lastExpired].
Expand Down
2 changes: 1 addition & 1 deletion x/contracts/simulator/state/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (p *ContractStateManager) GetBalance(ctx context.Context, address codec.Add
return 0, err
}

return binary.BigEndian.Uint64(v), nil
return database.ParseUInt64(v)
}

func (p *ContractStateManager) SetBalance(ctx context.Context, address codec.Address, amount uint64) error {
Expand Down
Loading