From bd8ccb52edfe3e1beee2fb9c3c5cc83a56d2800b Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 8 Feb 2021 08:48:50 +0100 Subject: pkg/host: use unix.Utsname instead of syscall.Utsname syscall.Utsname is hard to use portably, see: https://github.com/google/syzkaller/pull/2418#issuecomment-774858512 Switch to unix.Utsname which does not have this problem. --- pkg/host/features_linux.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'pkg/host/features_linux.go') diff --git a/pkg/host/features_linux.go b/pkg/host/features_linux.go index ab8c2fc48..fc925c00c 100644 --- a/pkg/host/features_linux.go +++ b/pkg/host/features_linux.go @@ -14,6 +14,7 @@ import ( "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/prog" "github.com/google/syzkaller/sys/linux" + "golang.org/x/sys/unix" ) func init() { @@ -233,21 +234,15 @@ func checkWifiEmulation() string { } func requireKernel(x, y int) string { - info := new(syscall.Utsname) - if err := syscall.Uname(info); err != nil { + info := new(unix.Utsname) + if err := unix.Uname(info); err != nil { return fmt.Sprintf("uname failed: %v", err) } - var ver []byte - for _, b := range info.Release { - if b == 0 { - break - } - ver = append(ver, byte(b)) - } - if ok, bad := matchKernelVersion(string(ver), x, y); bad { + ver := string(info.Release[:]) + if ok, bad := matchKernelVersion(ver, x, y); bad { return fmt.Sprintf("failed to parse kernel version (%v)", ver) } else if !ok { - return fmt.Sprintf("kernel %v.%v required (have %s)", x, y, ver) + return fmt.Sprintf("kernel %v.%v required (have %v)", x, y, ver) } return "" } -- cgit mrf-deployment