syscalls: chroot getpeername getsockname socketpair

kernel-src/arch/x86-64/syscall.asm

@@ -69,6 +69,10 @@ extern syscall_fsync
 extern syscall_fchdir
 extern syscall_getitimer
 extern syscall_setitimer
+extern syscall_socketpair
+extern syscall_getsockname
+extern syscall_getpeername
+extern syscall_chroot
 syscalltab:
 dq syscall_print
 dq syscall_mmap
@@ -140,7 +144,11 @@ dq syscall_fsync
 dq syscall_fchdir
 dq syscall_setitimer
 dq syscall_getitimer
-syscallcount equ 70
+dq syscall_socketpair
+dq syscall_getsockname
+dq syscall_getpeername
+dq syscall_chroot
+syscallcount equ 74
 section .text
 global arch_syscall_entry
 ; on entry:

kernel-src/arch/x86-64/syscalllog.c

@@ -5,7 +5,7 @@
 
 #ifdef SYSCALL_LOGGING
 
-#define SYSCALL_COUNT 68
+#define SYSCALL_COUNT 74
 #define LOGSTR(x) arch_e9_puts(x)
 
 static char *name[] = {
@@ -78,7 +78,11 @@ static char *name[] = {
 	"fsync",
 	"fchdir",
 	"getitimer",
-	"setitimer"
+	"setitimer",
+	"socketpair",
+	"getsockname",
+	"getpeername",
+	"chroot"
 };
 
 static char *args[] = {
@@ -152,6 +156,10 @@ static char *args[] = {
 	"fd %d",  // fchdir
 	"which %d new %p old %p\n", // setitimer
 	"which %d value %p\n", // getitimer
+	"domain %d type %d protocol %d", // socketpair
+	"fd %d addr %p addrlen %p", // getsockname
+	"fd %d addr %p addrlen %p",  // getpeername
+	"path %s" // chroot
 };
 
 #endif

kernel-src/sys/syscalls/chroot.c

@@ -0,0 +1,44 @@
+#include <kernel/syscalls.h>
+#include <kernel/scheduler.h>
+#include <kernel/vfs.h>
+#include <kernel/alloc.h>
+#include <errno.h>
+
+syscallret_t syscall_chroot(context_t *, const char *upath) {
+	syscallret_t ret = {
+		.ret = -1
+	};
+
+	if (upath > (char *)USERSPACE_END) {
+		ret.errno = EFAULT;
+		return ret;
+	}
+
+	// TODO safe string ops
+	char *path = alloc(strlen(upath) + 1);
+	strcpy(path, upath);
+
+	vnode_t *ref = path[0] == '/' ? sched_getroot() : sched_getcwd();
+	vnode_t *new = NULL;
+
+	ret.errno = vfs_lookup(&new, ref, path, NULL, 0);
+	if (ret.errno)
+		goto cleanup;
+
+	if (new->type != V_TYPE_DIR) {
+		ret.errno = ENOTDIR;
+		goto cleanup;
+	}
+
+	sched_setroot(new);
+	ret.ret = 0;
+
+	cleanup:
+	if (new)
+		VOP_RELEASE(new);
+
+	free(path);
+	VOP_RELEASE(ref);
+
+	return ret;
+}

kernel-src/sys/syscalls/getpeername.c

@@ -0,0 +1,42 @@
+#include <kernel/syscalls.h>
+#include <kernel/sock.h>
+
+syscallret_t syscall_getpeername(context_t *, int fd, void *uaddr, int *addrlen) {
+	syscallret_t ret = {
+		.ret = -1
+	};
+
+	file_t *file = fd_get(fd);
+	if (file == NULL) {
+		ret.errno = EBADF;
+		goto cleanup;
+	}
+
+	if (file->vnode->type != V_TYPE_SOCKET) {
+		ret.errno = ENOTSOCK;
+		goto cleanup;
+	}
+
+	sockaddr_t sockaddr;
+	socket_t *socket = SOCKFS_SOCKET_FROM_NODE(file->vnode);
+
+	ret.errno = socket->ops->getpeername(socket, &sockaddr);
+	if (ret.errno)
+		goto cleanup;
+
+	abisockaddr_t abisockaddr;
+
+	ret.errno = sock_addrtoabiaddr(socket->type, &sockaddr, &abisockaddr);
+	if (ret.errno)
+		goto cleanup;
+	
+	memcpy(uaddr, &abisockaddr, min(*addrlen, sizeof(abisockaddr_t)));
+	*addrlen = sizeof(abisockaddr_t);
+	ret.ret = 0;
+
+	cleanup:
+	if (file)
+		fd_release(file);
+
+	return ret;
+}

kernel-src/sys/syscalls/getsockname.c

@@ -0,0 +1,42 @@
+#include <kernel/syscalls.h>
+#include <kernel/sock.h>
+
+syscallret_t syscall_getsockname(context_t *, int fd, void *uaddr, int *addrlen) {
+	syscallret_t ret = {
+		.ret = -1
+	};
+
+	file_t *file = fd_get(fd);
+	if (file == NULL) {
+		ret.errno = EBADF;
+		goto cleanup;
+	}
+
+	if (file->vnode->type != V_TYPE_SOCKET) {
+		ret.errno = ENOTSOCK;
+		goto cleanup;
+	}
+
+	sockaddr_t sockaddr;
+	socket_t *socket = SOCKFS_SOCKET_FROM_NODE(file->vnode);
+
+	ret.errno = socket->ops->getname(socket, &sockaddr);
+	if (ret.errno)
+		goto cleanup;
+
+	abisockaddr_t abisockaddr;
+
+	ret.errno = sock_addrtoabiaddr(socket->type, &sockaddr, &abisockaddr);
+	if (ret.errno)
+		goto cleanup;
+	
+	memcpy(uaddr, &abisockaddr, min(*addrlen, sizeof(abisockaddr_t)));
+	*addrlen = sizeof(abisockaddr_t);
+	ret.ret = 0;
+
+	cleanup:
+	if (file)
+		fd_release(file);
+
+	return ret;
+}

kernel-src/sys/syscalls/socketpair.c

@@ -0,0 +1,82 @@
+#include <kernel/syscalls.h>
+#include <kernel/sock.h>
+
+syscallret_t syscall_socketpair(context_t *, int domain, int type, int protocol) {
+	syscallret_t ret = {
+		.ret = -1
+	};
+
+	// TODO flags could be OR in with type
+	// we will only support pairs of local sockets
+	if (domain != AF_LOCAL || type != SOCK_STREAM) {
+		ret.errno = EOPNOTSUPP;
+		return ret;
+	}
+
+	vnode_t *node1 = NULL;
+	vnode_t *node2 = NULL;
+	int fd1, fd2;
+	file_t *file1 = NULL;
+	file_t *file2 = NULL;
+	socket_t *sock1 = NULL;
+	socket_t *sock2 = NULL;
+
+	// create pair
+	ret.errno = localsock_pair(&sock1, &sock2);
+	if (ret.errno)
+		return ret;
+
+	// create vnodes
+	ret.errno = sockfs_newsocket(&node1, sock1);
+	if (ret.errno)
+		goto error;
+
+	ret.errno = sockfs_newsocket(&node2, sock2);
+	if (ret.errno)
+		goto error;
+
+	// create fds
+	ret.errno = fd_new(0, &file1, &fd1);
+	if (ret.errno)
+		goto error;
+
+	file1->vnode = node1;
+	file1->flags = FILE_WRITE | FILE_READ;
+	file1->offset = 0;
+	file1->mode = 0777;
+
+	ret.errno = fd_new(0, &file2, &fd2);
+	if (ret.errno)
+		goto error;
+
+	file2->vnode = node2;
+	file2->flags = FILE_WRITE | FILE_READ;
+	file2->offset = 0;
+	file2->mode = 0777;
+
+	ret.errno = 0;
+	ret.ret = (uint64_t)fd1 | ((uint64_t)fd2 << 32);
+
+	return ret;
+	error:
+
+	if (file1) {
+		fd_release(file1);
+		fd_close(fd1);
+	} else if (node1) {
+		VOP_RELEASE(node1);
+	} else {
+		sock1->ops->destroy(sock1);
+	}
+	
+	if (file2) {
+		fd_release(file2);
+		fd_close(fd2);
+	} if (node2) {
+		VOP_RELEASE(node2);
+	} else {
+		sock1->ops->destroy(sock2);
+	}
+
+	return ret;
+}