From a9441aea2780da8c93da1c73da860219f98438de Mon Sep 17 00:00:00 2001
From: Ayush Ranjan <ayushranjan@google.com>
Date: Wed, 3 Mar 2021 10:23:55 -0800
Subject: [op] Replace syscall package usage with golang.org/x/sys/unix in
 pkg/.

The syscall package has been deprecated in favor of golang.org/x/sys.

Note that syscall is still used in the following places:
- pkg/sentry/socket/hostinet/stack.go: some netlink related functionalities
  are not yet available in golang.org/x/sys.
- syscall.Stat_t is still used in some places because os.FileInfo.Sys() still
  returns it and not unix.Stat_t.

Updates #214

PiperOrigin-RevId: 360701387
---
 pkg/memutil/memutil_unsafe.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'pkg/memutil')

diff --git a/pkg/memutil/memutil_unsafe.go b/pkg/memutil/memutil_unsafe.go
index 979d942a9..6676d1ce3 100644
--- a/pkg/memutil/memutil_unsafe.go
+++ b/pkg/memutil/memutil_unsafe.go
@@ -19,7 +19,6 @@ package memutil
 
 import (
 	"fmt"
-	"syscall"
 	"unsafe"
 
 	"golang.org/x/sys/unix"
@@ -27,13 +26,13 @@ import (
 
 // CreateMemFD creates a memfd file and returns the fd.
 func CreateMemFD(name string, flags int) (int, error) {
-	p, err := syscall.BytePtrFromString(name)
+	p, err := unix.BytePtrFromString(name)
 	if err != nil {
 		return -1, err
 	}
-	fd, _, e := syscall.Syscall(unix.SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
+	fd, _, e := unix.Syscall(unix.SYS_MEMFD_CREATE, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
 	if e != 0 {
-		if e == syscall.ENOSYS {
+		if e == unix.ENOSYS {
 			return -1, fmt.Errorf("memfd_create(2) is not implemented. Check that you have Linux 3.17 or higher")
 		}
 		return -1, e
-- 
cgit v1.2.3