Module Name: src
Committed By: martin
Date: Fri May 25 15:42:30 UTC 2018
Modified Files:
src/tests/lib/libc/sys: Makefile
Added Files:
src/tests/lib/libc/sys: t_syscall.c
Log Message:
Add a test to verify syscall() and/or __syscall() are working.
This used to trigger a panic (see PR kern/53261) on arm.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/sys/t_syscall.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.51 src/tests/lib/libc/sys/Makefile:1.52
--- src/tests/lib/libc/sys/Makefile:1.51 Fri May 18 06:39:58 2018
+++ src/tests/lib/libc/sys/Makefile Fri May 25 15:42:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2018/05/18 06:39:58 kamil Exp $
+# $NetBSD: Makefile,v 1.52 2018/05/25 15:42:30 martin Exp $
MKMAN= no
@@ -70,6 +70,7 @@ TESTS_C+= t_sigtimedwait
TESTS_C+= t_socketpair
TESTS_C+= t_swapcontext
TESTS_C+= t_stat
+TESTS_C+= t_syscall
TESTS_C+= t_timer_create
TESTS_C+= t_truncate
TESTS_C+= t_ucontext
Added files:
Index: src/tests/lib/libc/sys/t_syscall.c
diff -u /dev/null src/tests/lib/libc/sys/t_syscall.c:1.1
--- /dev/null Fri May 25 15:42:30 2018
+++ src/tests/lib/libc/sys/t_syscall.c Fri May 25 15:42:30 2018
@@ -0,0 +1,117 @@
+/* $NetBSD: t_syscall.c,v 1.1 2018/05/25 15:42:30 martin Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Martin Husemann.
+ *
+ * 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_syscall.c,v 1.1 2018/05/25 15:42:30 martin Exp $");
+
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <err.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/mman.h>
+#include <sys/endian.h>
+#include <sys/syscall.h>
+
+#if !defined(_LP64) && BYTE_ORDER == _BIG_ENDIAN
+#define __SYSCALL_TO_UINPTRT(V) ((uintptr_t)((V)>>32))
+#else
+#define __SYSCALL_TO_UINPTRT(V) ((uintptr_t)(V))
+#endif
+
+static const char secrect_data[1024] = {
+ "my secret key\n"
+};
+
+#define FILE_NAME "dummy"
+
+#ifndef _LP64
+ATF_TC(mmap_syscall);
+
+ATF_TC_HEAD(mmap_syscall, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Tests mmap(2) via syscall(2)");
+}
+
+ATF_TC_BODY(mmap_syscall, tc)
+{
+ int fd;
+ const char *p;
+
+ fd = open(FILE_NAME, O_RDWR|O_CREAT|O_TRUNC, 0666);
+ ATF_REQUIRE(fd != -1);
+
+ write(fd, secrect_data, sizeof(secrect_data));
+
+ p = (const char *)syscall(SYS_mmap,
+ 0, sizeof(secrect_data), PROT_READ, MAP_PRIVATE, fd, 0, 0, 0);
+ ATF_REQUIRE(p != NULL);
+
+ ATF_REQUIRE(strcmp(p, secrect_data) == 0);
+}
+#endif
+
+ATF_TC(mmap___syscall);
+
+ATF_TC_HEAD(mmap___syscall, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Tests mmap(2) via __syscall(2)");
+}
+
+ATF_TC_BODY(mmap___syscall, tc)
+{
+ int fd;
+ const char *p;
+
+ fd = open(FILE_NAME, O_RDWR|O_CREAT|O_TRUNC, 0666);
+ ATF_REQUIRE(fd != -1);
+
+ write(fd, secrect_data, sizeof(secrect_data));
+
+ p = (const char *)__SYSCALL_TO_UINPTRT(__syscall(SYS_mmap,
+ 0, sizeof(secrect_data), PROT_READ, MAP_PRIVATE, fd, 0, 0, 0));
+ ATF_REQUIRE(p != NULL);
+
+ ATF_REQUIRE(strcmp(p, secrect_data) == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+#ifndef _LP64
+ ATF_TP_ADD_TC(tp, mmap_syscall);
+#endif
+ ATF_TP_ADD_TC(tp, mmap___syscall);
+
+ return atf_no_error();
+}
