From c47bbd410a8bdaf1c636b692508e82fe10f85e2b Mon Sep 17 00:00:00 2001 From: guenther Date: Thu, 6 Jan 2022 03:30:15 +0000 Subject: [PATCH] t_syscall was a test for the gcc 1.x off_t syscall padding, which was an implementation detail and has been deleted, so delete the test --- regress/lib/libc/sys/Makefile | 4 +- regress/lib/libc/sys/t_syscall.c | 123 ------------------------------- 2 files changed, 2 insertions(+), 125 deletions(-) delete mode 100644 regress/lib/libc/sys/t_syscall.c diff --git a/regress/lib/libc/sys/Makefile b/regress/lib/libc/sys/Makefile index 86a8af55fac..93b977707a6 100644 --- a/regress/lib/libc/sys/Makefile +++ b/regress/lib/libc/sys/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2021/09/19 08:20:04 claudio Exp $ +# $OpenBSD: Makefile,v 1.15 2022/01/06 03:30:15 guenther Exp $ # Copyright (c) 2019 Moritz Buhl # Copyright (c) 2019 Alexander Bluhm @@ -63,7 +63,7 @@ PROGS += t_sigaction PROGS += t_sigaltstack PROGS += t_socketpair PROGS += t_stat -PROGS += t_syscall +#PROGS += t_syscall Deleted: test of gcc1.x syscall pad PROGS += t_truncate PROGS += t_umask t_unlink PROGS += t_vfork diff --git a/regress/lib/libc/sys/t_syscall.c b/regress/lib/libc/sys/t_syscall.c deleted file mode 100644 index a8e3cd12881..00000000000 --- a/regress/lib/libc/sys/t_syscall.c +++ /dev/null @@ -1,123 +0,0 @@ -/* $OpenBSD: t_syscall.c,v 1.4 2021/12/13 16:56:48 deraadt Exp $ */ -/* $NetBSD: t_syscall.c,v 1.4 2021/01/18 05:44:20 simonb 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 "macros.h" - -#include "atf-c.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef __OpenBSD__ -/* Declare prototype of __syscall locally specifying the return type. */ -quad_t __syscall(quad_t number, ...); -#endif - -#if !defined(_LP64) && BYTE_ORDER == _BIG_ENDIAN -#define __SYSCALL_TO_UINTPTR_T(V) ((uintptr_t)((V)>>32)) -#else -#define __SYSCALL_TO_UINTPTR_T(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 != MAP_FAILED); - - 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_UINTPTR_T(__syscall(SYS_mmap, - 0, sizeof(secrect_data), PROT_READ, MAP_PRIVATE, fd, - /* pad*/ 0, (off_t)0)); - ATF_REQUIRE(p != MAP_FAILED); - - 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(); -} -- 2.20.1