From 28b24332d95f2f7df44ec7e7a5e0025bcadc6277 Mon Sep 17 00:00:00 2001 From: Alon Zahavi Date: Tue, 28 Nov 2023 11:15:26 +0000 Subject: sys/linux, pkg/host, executor: add NVMe-oF/TCP subsystem support Add new pseudo-syscall for creating a socket in init netns and connecting to NVMe-oF/TCP server on 127.0.0.1:4420. Also add descriptions for NVMe-oF/TCP. --- executor/common_linux.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) (limited to 'executor') diff --git a/executor/common_linux.h b/executor/common_linux.h index 42d352a52..2f10ae3d6 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -730,7 +730,7 @@ static void initialize_tun(void) } #endif -#if SYZ_EXECUTOR || __NR_syz_init_net_socket || SYZ_DEVLINK_PCI +#if SYZ_EXECUTOR || __NR_syz_init_net_socket || SYZ_DEVLINK_PCI || __NR_syz_socket_connect_nvme_tcp const int kInitNetNsFd = 201; // see kMaxFd #endif @@ -2484,6 +2484,50 @@ static long syz_init_net_socket(volatile long domain, volatile long type, volati #endif #endif +#if SYZ_EXECUTOR || __NR_syz_socket_connect_nvme_tcp +#if SYZ_EXECUTOR || SYZ_SANDBOX_NONE || SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE +#include +#include +#include +#include +#include +#include +#include +#include + +static long syz_socket_connect_nvme_tcp() +{ + struct sockaddr_in nvme_local_address; + int netns = open("/proc/self/ns/net", O_RDONLY); + if (netns == -1) + return netns; + if (setns(kInitNetNsFd, 0)) + return -1; + int sock = syscall(__NR_socket, AF_INET, SOCK_STREAM, 0x0); + int err = errno; + if (setns(netns, 0)) + fail("setns(netns) failed"); + close(netns); + errno = err; + // We only connect to an NVMe-oF/TCP server on 127.0.0.1:4420 + nvme_local_address.sin_family = AF_INET; + nvme_local_address.sin_port = htobe16(4420); + nvme_local_address.sin_addr.s_addr = htobe32(0x7f000001); + err = syscall(__NR_connect, sock, &nvme_local_address, sizeof(nvme_local_address)); + if (err != 0) { + close(sock); + return -1; + } + return sock; +} +#else +static long syz_socket_connect_nvme_tcp() +{ + return syscall(__NR_socket, -1, 0, 0); +} +#endif +#endif + #if SYZ_EXECUTOR || SYZ_VHCI_INJECTION #include #include @@ -3851,7 +3895,7 @@ static void sandbox_common() prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0); setsid(); -#if SYZ_EXECUTOR || __NR_syz_init_net_socket || SYZ_DEVLINK_PCI +#if SYZ_EXECUTOR || __NR_syz_init_net_socket || SYZ_DEVLINK_PCI || __NR_syz_socket_connect_nvme_tcp int netns = open("/proc/self/ns/net", O_RDONLY); if (netns == -1) fail("open(/proc/self/ns/net) failed"); -- cgit mrf-deployment