From: jsing <jsing@openbsd.org>
Date: Fri, 10 Aug 2018 15:58:16 +0000 (+0000)
Subject: Add a regress test that checks file descriptor allocation across fork.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=58433342a1fe3852844b19900eb44b4d992525bc;p=openbsd

Add a regress test that checks file descriptor allocation across fork.

In particular, this checks the behaviour of kqueue fds being closed and
reallocated across a fork.
---

diff --git a/regress/sys/kern/Makefile b/regress/sys/kern/Makefile
index a36c7396781..7dfb9d95e78 100644
--- a/regress/sys/kern/Makefile
+++ b/regress/sys/kern/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.75 2018/07/30 17:27:37 anton Exp $
+#	$OpenBSD: Makefile,v 1.76 2018/08/10 15:58:16 jsing Exp $
 
-SUBDIR+= __syscall access accept dup2 dup2_accept dup2_self
+SUBDIR+= __syscall access accept dup2 dup2_accept dup2_self descrip
 SUBDIR+= exec_self execve exit extent
 SUBDIR+= fchdir
 SUBDIR+= fchown
diff --git a/regress/sys/kern/descrip/Makefile b/regress/sys/kern/descrip/Makefile
new file mode 100644
index 00000000000..e06d90a3e9b
--- /dev/null
+++ b/regress/sys/kern/descrip/Makefile
@@ -0,0 +1,5 @@
+# $OpenBSD: Makefile,v 1.1 2018/08/10 15:58:16 jsing Exp $
+
+PROG=	descrip
+
+.include <bsd.regress.mk>
diff --git a/regress/sys/kern/descrip/descrip.c b/regress/sys/kern/descrip/descrip.c
new file mode 100644
index 00000000000..248bb083829
--- /dev/null
+++ b/regress/sys/kern/descrip/descrip.c
@@ -0,0 +1,57 @@
+/* $OpenBSD: descrip.c,v 1.1 2018/08/10 15:58:16 jsing Exp $ */
+/*
+ * Copyright (c) 2018 Joel Sing <jsing@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#include <assert.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+
+int
+main(int argc, char **argv)
+{
+	int fd, kq;
+
+	kq = kqueue();
+	assert(kq == 3);
+
+	fd = open("/etc/hosts", O_RDONLY);
+	assert(fd == 4);
+
+	if (fork() == 0) {
+		/*
+		 * The existing kq fd should have been closed across fork,
+		 * hence we expect fd 3 to be reallocated on this kqueue call.
+		 */
+		kq = kqueue();
+		assert(kq == 3);
+
+		/*
+		 * fd 4 should still be open and allocated across fork,
+		 * hence opening another file should result in fd 5 being
+		 * allocated.
+		 */
+		fd = open("/etc/hosts", O_RDONLY);
+		assert(fd == 5);
+	}
+
+	wait(NULL);
+}