From 520f7349354094a54f23c778ada256ed1579db6e Mon Sep 17 00:00:00 2001
From: anton <anton@openbsd.org>
Date: Mon, 30 Jul 2018 17:27:37 +0000
Subject: [PATCH] Add regress covering the recently fixed NULL pointer deref in
 open().

---
 regress/sys/kern/Makefile      |  3 ++-
 regress/sys/kern/open/Makefile | 11 ++++++++++
 regress/sys/kern/open/open.c   | 37 ++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 regress/sys/kern/open/Makefile
 create mode 100644 regress/sys/kern/open/open.c

diff --git a/regress/sys/kern/Makefile b/regress/sys/kern/Makefile
index 7e4106d06d1..a36c7396781 100644
--- a/regress/sys/kern/Makefile
+++ b/regress/sys/kern/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.74 2018/07/22 06:39:46 anton Exp $
+#	$OpenBSD: Makefile,v 1.75 2018/07/30 17:27:37 anton Exp $
 
 SUBDIR+= __syscall access accept dup2 dup2_accept dup2_self
 SUBDIR+= exec_self execve exit extent
@@ -14,6 +14,7 @@ SUBDIR+= main-thread-exited
 SUBDIR+= mmap mmap2 mmap3 mmap-fail
 SUBDIR+= mount
 SUBDIR+= nanosleep noexec
+SUBDIR+= open
 SUBDIR+= pledge
 SUBDIR+= pread preadv ptmget pty pwrite pwritev rcvtimeo
 SUBDIR+= rlimit-file signal signal-stress sigprof sigsuspend
diff --git a/regress/sys/kern/open/Makefile b/regress/sys/kern/open/Makefile
new file mode 100644
index 00000000000..f57dcb7122a
--- /dev/null
+++ b/regress/sys/kern/open/Makefile
@@ -0,0 +1,11 @@
+#	$OpenBSD: Makefile,v 1.1 2018/07/30 17:27:37 anton Exp $
+
+PROG=		open
+WARNINGS=	yes
+
+REGRESS_TARGETS+=	clone-device
+
+clone-device: ${PROG}
+	${SUDO} ./${PROG}
+
+.include <bsd.regress.mk>
diff --git a/regress/sys/kern/open/open.c b/regress/sys/kern/open/open.c
new file mode 100644
index 00000000000..1088211bfe9
--- /dev/null
+++ b/regress/sys/kern/open/open.c
@@ -0,0 +1,37 @@
+/*	$OpenBSD: open.c,v 1.1 2018/07/30 17:27:37 anton Exp $	*/
+/*
+ * Copyright (c) 2018 Anton Lindqvist <anton@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.
+ */
+
+/*
+ * Regression test for NULL-deref inside doopenat().
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+int
+main(void)
+{
+	const char *path = "/dev/bpf";
+
+	int fd = open(path, O_WRONLY | O_TRUNC | O_SHLOCK);
+	if (fd == -1)
+		err(1, "open: %s", path);
+	close(fd);
+
+	return 0;
+}
-- 
2.20.1