Add SIOCGIFFLAGS ioctl support to hostinet.

PiperOrigin-RevId: 382194711

4 files changed, 27 insertions, 1 deletions

diff --git a/pkg/sentry/socket/hostinet/socket_unsafe.go b/pkg/sentry/socket/hostinet/socket_unsafe.go
index d3be2d825..86dc879d5 100644
--- a/pkg/sentry/socket/hostinet/socket_unsafe.go
+++ b/pkg/sentry/socket/hostinet/socket_unsafe.go
@@ -67,7 +67,23 @@ func ioctl(ctx context.Context, fd int, io usermem.IO, args arch.SyscallArgument
 			AddressSpaceActive: true,
 		})
 		return 0, err
-
+	case unix.SIOCGIFFLAGS:
+		cc := &usermem.IOCopyContext{
+			Ctx: ctx,
+			IO:  io,
+			Opts: usermem.IOOpts{
+				AddressSpaceActive: true,
+			},
+		}
+		var ifr linux.IFReq
+		if _, err := ifr.CopyIn(cc, args[2].Pointer()); err != nil {
+			return 0, err
+		}
+		if _, _, errno := unix.Syscall(unix.SYS_IOCTL, uintptr(fd), cmd, uintptr(unsafe.Pointer(&ifr))); errno != 0 {
+			return 0, translateIOSyscallError(errno)
+		}
+		_, err := ifr.CopyOut(cc, args[2].Pointer())
+		return 0, err
 	default:
 		return 0, syserror.ENOTTY
 	}
diff --git a/runsc/boot/filter/config.go b/runsc/boot/filter/config.go
index 752fea0e1..33e738efc 100644
--- a/runsc/boot/filter/config.go
+++ b/runsc/boot/filter/config.go
@@ -459,6 +459,10 @@ func hostInetFilters() seccomp.SyscallRules {
 				seccomp.MatchAny{},
 				seccomp.EqualTo(unix.TIOCINQ),
 			},
+			{
+				seccomp.MatchAny{},
+				seccomp.EqualTo(unix.SIOCGIFFLAGS),
+			},
 		},
 		unix.SYS_LISTEN:   {},
 		unix.SYS_READV:    {},
diff --git a/test/syscalls/BUILD b/test/syscalls/BUILD
index 1257c0553..de08091af 100644
--- a/test/syscalls/BUILD
+++ b/test/syscalls/BUILD
@@ -738,6 +738,7 @@ syscall_test(
 )
 
 syscall_test(
+    add_hostinet = True,
     test = "//test/syscalls/linux:socket_netdevice_test",
 )
 
diff --git a/test/syscalls/linux/socket_netdevice.cc b/test/syscalls/linux/socket_netdevice.cc
index 5f8d7f981..8d214a2b7 100644
--- a/test/syscalls/linux/socket_netdevice.cc
+++ b/test/syscalls/linux/socket_netdevice.cc
@@ -37,6 +37,7 @@ using ::testing::AnyOf;
 using ::testing::Eq;
 
 TEST(NetdeviceTest, Loopback) {
+  SKIP_IF(IsRunningWithHostinet());
   FileDescriptor sock =
       ASSERT_NO_ERRNO_AND_VALUE(Socket(AF_INET, SOCK_DGRAM, 0));
 
@@ -60,6 +61,7 @@ TEST(NetdeviceTest, Loopback) {
 }
 
 TEST(NetdeviceTest, Netmask) {
+  SKIP_IF(IsRunningWithHostinet());
   // We need an interface index to identify the loopback device.
   FileDescriptor sock =
       ASSERT_NO_ERRNO_AND_VALUE(Socket(AF_INET, SOCK_DGRAM, 0));
@@ -135,6 +137,7 @@ TEST(NetdeviceTest, Netmask) {
 }
 
 TEST(NetdeviceTest, InterfaceName) {
+  SKIP_IF(IsRunningWithHostinet());
   FileDescriptor sock =
       ASSERT_NO_ERRNO_AND_VALUE(Socket(AF_INET, SOCK_DGRAM, 0));
 
@@ -168,6 +171,7 @@ TEST(NetdeviceTest, InterfaceFlags) {
 }
 
 TEST(NetdeviceTest, InterfaceMTU) {
+  SKIP_IF(IsRunningWithHostinet());
   FileDescriptor sock =
       ASSERT_NO_ERRNO_AND_VALUE(Socket(AF_INET, SOCK_DGRAM, 0));
 
@@ -181,6 +185,7 @@ TEST(NetdeviceTest, InterfaceMTU) {
 }
 
 TEST(NetdeviceTest, EthtoolGetTSInfo) {
+  SKIP_IF(IsRunningWithHostinet());
   FileDescriptor sock =
       ASSERT_NO_ERRNO_AND_VALUE(Socket(AF_INET, SOCK_DGRAM, 0));