Swap internal ioctl implementation with golang.org/x/sys

alex-matei · austinvazquez · commit 7bd3be948705 · 2024-05-13T15:21:31.000Z
Replace internal LOOP_CONFIGURE ioctl implementation with IoctlLoopConfigure from sys Signed-off-by: Alexandru Matei <alexandru.matei@uipath.com> (cherry picked from commit c2dfae8) Signed-off-by: Austin Vazquez <macedonv@amazon.com>
diff --git a/mount/losetup_linux.go b/mount/losetup_linux.go
@@ -21,9 +21,7 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"syscall"
 	"time"
-	"unsafe"
 
 	kernel "github.com/containerd/containerd/contrib/seccomp/kernelversion"
 	"github.com/containerd/containerd/pkg/randutil"
@@ -35,8 +33,6 @@ const (
 	loopDevFormat   = "/dev/loop%d"
 
 	ebusyString = "device or resource busy"
-
-	loopConfigureIoctl = 0x4c0a
 )
 
 type LoopConfig struct {
@@ -46,15 +42,6 @@ type LoopConfig struct {
 	Reserved  [8]uint64
 }
 
-func ioctlConfigure(fd int, value *LoopConfig) error {
-	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, uintptr(fd), uintptr(loopConfigureIoctl), uintptr(unsafe.Pointer(value)))
-	if err == 0 {
-		return nil
-	}
-
-	return err
-}
-
 // LoopParams parameters to control loop device setup
 type LoopParams struct {
 	// Loop device should forbid write
@@ -107,7 +94,7 @@ func setupLoopDev(backingFile, loopDev string, param LoopParams) (_ *os.File, re
 
 	fiveDotEight := kernel.KernelVersion{Kernel: 5, Major: 8}
 	if ok, err := kernel.GreaterEqualThan(fiveDotEight); err == nil && ok {
-		config := LoopConfig{
+		config := unix.LoopConfig{
 			Fd: uint32(back.Fd()),
 		}
 
@@ -124,7 +111,7 @@ func setupLoopDev(backingFile, loopDev string, param LoopParams) (_ *os.File, re
 			config.Info.Flags |= unix.LO_FLAGS_DIRECT_IO
 		}
 
-		if err := ioctlConfigure(int(loop.Fd()), &config); err != nil {
+		if err := unix.IoctlLoopConfigure(int(loop.Fd()), &config); err != nil {
 			return nil, fmt.Errorf("failed to configure loop device: %s: %w", loopDev, err)
 		}
 
