summaryrefslogtreecommitdiff
path: root/tests/kernel
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2021-10-23 18:46:26 +0000
committerthorpej <thorpej@NetBSD.org>2021-10-23 18:46:26 +0000
commit7995f7295e4d852efb907d147efaf405d937fcce (patch)
treed22c53e7a6509f6e4d58d0ae5735f2b61a5aa2a8 /tests/kernel
parent4e9193fe8ff1a06a048493035baee717fe845a20 (diff)
Fix a regression introduced in kern_event.c,v 1.129 that would cause
"udata" to get clobbered on ONESHOT events, and add a unit test for it. Reported by martin@ (manifested in his case as a KASSERT() firing when running unit tests in COMPAT_NETBSD32).
Diffstat (limited to 'tests/kernel')
-rw-r--r--tests/kernel/kqueue/Makefile3
-rw-r--r--tests/kernel/kqueue/t_oneshot.c73
2 files changed, 75 insertions, 1 deletions
diff --git a/tests/kernel/kqueue/Makefile b/tests/kernel/kqueue/Makefile
index f3a1a958126..b353babfe43 100644
--- a/tests/kernel/kqueue/Makefile
+++ b/tests/kernel/kqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/10/23 01:28:33 thorpej Exp $
+# $NetBSD: Makefile,v 1.9 2021/10/23 18:46:26 thorpej Exp $
WARNS?=6
NOMAN= # defined
@@ -12,6 +12,7 @@ TESTS_SUBDIRS+= write
TESTS_C= t_empty
TESTS_C+= t_ioctl
+TESTS_C+= t_oneshot
TESTS_C+= t_proc1
TESTS_C+= t_proc2
TESTS_C+= t_proc3
diff --git a/tests/kernel/kqueue/t_oneshot.c b/tests/kernel/kqueue/t_oneshot.c
new file mode 100644
index 00000000000..616082d13f1
--- /dev/null
+++ b/tests/kernel/kqueue/t_oneshot.c
@@ -0,0 +1,73 @@
+/* $NetBSD: t_oneshot.c,v 1.1 2021/10/23 18:46:26 thorpej Exp $ */
+
+/*-
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_oneshot.c,v 1.1 2021/10/23 18:46:26 thorpej Exp $");
+
+#include <sys/types.h>
+#include <sys/event.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#define MY_UDATA ((void *)0xbeefcafe)
+
+ATF_TC(oneshot_udata);
+ATF_TC_HEAD(oneshot_udata, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "tests that udata is round-tripped correctly for ONESHOT events.");
+}
+
+ATF_TC_BODY(oneshot_udata, tc)
+{
+ struct kevent event[1];
+ int kq;
+
+ ATF_REQUIRE((kq = kqueue()) >= 0);
+
+ EV_SET(&event[0], 1, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 1, MY_UDATA);
+
+ ATF_REQUIRE(kevent(kq, event, 1, NULL, 0, NULL) == 0);
+ memset(event, 0, sizeof(event));
+ ATF_REQUIRE(kevent(kq, NULL, 0, event, 1, NULL) == 1);
+ ATF_REQUIRE(event[0].ident == 1);
+ ATF_REQUIRE(event[0].data == 1);
+ ATF_REQUIRE(event[0].udata == MY_UDATA);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, oneshot_udata);
+
+ return atf_no_error();
+}