diff options
| author |   semarie <semarie@openbsd.org> | 2015-10-30 07:24:20 +0000 |
|---|---|---|
| committer | semarie <semarie@openbsd.org> | 2015-10-30 07:24:20 +0000 |
| commit | 8a3e8671f6ffcaee2826107642397a979d762488 (patch) | |
| tree | c73b6baa5f3ea302131e47896d96e52d416b95c5 | |
| parent | uvm_deallocate()'s return type is void, not int. This has apparently (diff) | |
| download | wireguard-openbsd-8a3e8671f6ffcaee2826107642397a979d762488.tar.xz wireguard-openbsd-8a3e8671f6ffcaee2826107642397a979d762488.zip | |
regress: pledge
- for calling ioctl(2), we need "stdio" now: change test_request_tty
- for calling kill(2), we need "stdio" now: change test_kill
| -rw-r--r-- | regress/sys/kern/pledge/generic/main.c | 6 | ||||
| -rw-r--r-- | regress/sys/kern/pledge/generic/test_tty.c | 6 | ||||
| -rw-r--r-- | regress/sys/kern/pledge/generic/tests.out | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/regress/sys/kern/pledge/generic/main.c b/regress/sys/kern/pledge/generic/main.c index 39f6ed0bae2..3297d590b87 100644 --- a/regress/sys/kern/pledge/generic/main.c +++ b/regress/sys/kern/pledge/generic/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.7 2015/10/29 10:23:55 semarie Exp $ */ +/* $OpenBSD: main.c,v 1.8 2015/10/30 07:24:20 semarie Exp $ */ /* * Copyright (c) 2015 Sebastien Marie <semarie@openbsd.org> * @@ -239,8 +239,8 @@ main(int argc, char *argv[]) /* kill under fattr is forbidden */ start_test(&ret, "fattr", NULL, test_kill); - /* kill under proc is allowed */ - start_test(&ret, "proc", NULL, test_kill); + /* kill under stdio is allowed */ + start_test(&ret, "stdio", NULL, test_kill); /* stdio for open(2) */ start_test(&ret, "stdio rpath", NULL, test_rpath); diff --git a/regress/sys/kern/pledge/generic/test_tty.c b/regress/sys/kern/pledge/generic/test_tty.c index faabc7961fd..695c1e25df6 100644 --- a/regress/sys/kern/pledge/generic/test_tty.c +++ b/regress/sys/kern/pledge/generic/test_tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: test_tty.c,v 1.3 2015/10/26 18:52:19 semarie Exp $ */ +/* $OpenBSD: test_tty.c,v 1.4 2015/10/30 07:24:20 semarie Exp $ */ /* * Copyright (c) 2015 Sebastien Marie <semarie@openbsd.org> * @@ -44,8 +44,8 @@ test_request_tty() _exit(errno); errno = 0; /* discard error */ - /* tests that only need tty */ - if (pledge("tty", NULL) == -1) + /* tests that only need tty (and stdio for calling ioctl(2)) */ + if (pledge("stdio tty", NULL) == -1) _exit(errno); diff --git a/regress/sys/kern/pledge/generic/tests.out b/regress/sys/kern/pledge/generic/tests.out index cab8dad59b3..b123ceca845 100644 --- a/regress/sys/kern/pledge/generic/tests.out +++ b/regress/sys/kern/pledge/generic/tests.out @@ -1,4 +1,4 @@ -# $OpenBSD: tests.out,v 1.9 2015/10/29 10:23:55 semarie Exp $ +# $OpenBSD: tests.out,v 1.10 2015/10/30 07:24:20 semarie Exp $ test(test_nop): pledge=("",NULL) status=0 exit=0 test(test_inet): pledge=("",NULL) status=9 signal=9 pledged_syscall=97 test(test_inet): pledge=("abort",NULL) status=134 signal=6 coredump=present pledged_syscall=97 @@ -6,7 +6,7 @@ test(test_inet): pledge=("stdio",NULL) status=9 signal=9 pledged_syscall=97 test(test_inet): pledge=("inet",NULL) status=9 signal=9 pledged_syscall=6 test(test_inet): pledge=("stdio inet",NULL) status=0 exit=0 test(test_kill): pledge=("fattr",NULL) status=9 signal=9 pledged_syscall=37 -test(test_kill): pledge=("proc",NULL) status=2 signal=2 pledged_syscall=not_found +test(test_kill): pledge=("stdio",NULL) status=2 signal=2 pledged_syscall=not_found test(test_rpath): pledge=("stdio rpath",NULL) status=0 exit=0 test(test_wpath): pledge=("stdio wpath",NULL) status=0 exit=0 test(test_cpath): pledge=("cpath",NULL) status=0 exit=0 |