diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55e0a828b7..0fa40eedec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,7 @@ jobs: ./internal/guest... ./internal/tools/... ./pkg/... + ./ext4/... steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 diff --git a/ext4/internal/compactext4/verify_linux_test.go b/ext4/internal/compactext4/verify_linux_test.go index e05deab654..745c1c0b79 100644 --- a/ext4/internal/compactext4/verify_linux_test.go +++ b/ext4/internal/compactext4/verify_linux_test.go @@ -31,7 +31,10 @@ func expectedDevice(f *File) uint64 { } func llistxattr(path string, b []byte) (int, error) { - pathp := syscall.StringBytePtr(path) + pathp, err := syscall.BytePtrFromString(path) + if err != nil { + return 0, &os.PathError{Path: path, Op: "llistxattr", Err: err} + } var p unsafe.Pointer if len(b) > 0 { p = unsafe.Pointer(&b[0]) @@ -44,8 +47,14 @@ func llistxattr(path string, b []byte) (int, error) { } func lgetxattr(path string, name string, b []byte) (int, error) { - pathp := syscall.StringBytePtr(path) - namep := syscall.StringBytePtr(name) + pathp, err := syscall.BytePtrFromString(path) + if err != nil { + return 0, &os.PathError{Path: path, Op: "llistxattr", Err: err} + } + namep, err := syscall.BytePtrFromString(name) + if err != nil { + return 0, &os.PathError{Path: path, Op: "llistxattr", Err: err} + } var p unsafe.Pointer if len(b) > 0 { p = unsafe.Pointer(&b[0]) @@ -118,6 +127,7 @@ func streamEqual(r1, r2 io.Reader) (bool, error) { } func verifyTestFile(t *testing.T, mountPath string, tf testFile) { + t.Helper() name := path.Join(mountPath, tf.Path) fi, err := os.Lstat(name) if err != nil { @@ -213,6 +223,7 @@ func getCaps() (caps, error) { } func mountImage(t *testing.T, image string, mountPath string) bool { + t.Helper() caps, err := getCaps() if err != nil || caps.data[0].effective&(1<