Skip to content

Don't use unsafe.Sizeof where encoding/binary.Size suffices #1404

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

Merged
anmaxvl merged 1 commit into from
May 20, 2022
Merged

Don't use unsafe.Sizeof where encoding/binary.Size suffices #1404

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions ext4/dmverity/dmverity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"fmt"
"io"
"os"
"unsafe"

"github.com/pkg/errors"

Expand All @@ -27,7 +26,10 @@ const (
VeritySignature = "verity"
)

var salt = bytes.Repeat([]byte{0}, 32)
var (
salt = bytes.Repeat([]byte{0}, 32)
sbSize = binary.Size(dmveritySuperblock{})
)

var (
ErrSuperBlockReadFailure = errors.New("failed to read dm-verity super block")
Expand Down Expand Up @@ -234,7 +236,6 @@ func ComputeAndWriteHashDevice(r io.ReadSeeker, w io.WriteSeeker) error {
return errors.Wrap(err, "failed to write dm-verity super-block")
}
// write super-block padding
sbSize := int(unsafe.Sizeof(*dmVeritySB))
padding := bytes.Repeat([]byte{0}, blockSize-(sbSize%blockSize))
if _, err = w.Write(padding); err != nil {
return err
Expand Down
2 changes: 0 additions & 2 deletions ext4/dmverity/dmverity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"os"
"strings"
"testing"
"unsafe"

"github.com/pkg/errors"
)
Expand Down Expand Up @@ -45,7 +44,6 @@ func writeDMVeritySuperBlock(filename string) (*os.File, error) {
if err := binary.Write(out, binary.LittleEndian, sb); err != nil {
return nil, err
}
sbSize := int(unsafe.Sizeof(*sb))
padding := bytes.Repeat([]byte{0}, blockSize-(sbSize%blockSize))
if _, err = out.Write(padding); err != nil {
return nil, err
Expand Down
7 changes: 4 additions & 3 deletions test/vendor/github.com/Microsoft/hcsshim/ext4/dmverity/dmverity.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.