summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbeck <beck@openbsd.org>2018-04-27 15:28:00 +0000
committerbeck <beck@openbsd.org>2018-04-27 15:28:00 +0000
commit93989954015f174daa3bf4dc7b0ee56552b56a0b (patch)
tree349850384467ad83deffb5663d0e76a68b5d0f01
parentFix the scan loop: We were only looking for an AP once and stopped (diff)
downloadwireguard-openbsd-93989954015f174daa3bf4dc7b0ee56552b56a0b.tar.xz
wireguard-openbsd-93989954015f174daa3bf4dc7b0ee56552b56a0b.zip
Fix regress that was depengin on pledgepath() being able to
traverse the filesystem unrestricted
-rw-r--r--regress/sys/kern/pledge/pledgepath/syscalls.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/regress/sys/kern/pledge/pledgepath/syscalls.c b/regress/sys/kern/pledge/pledgepath/syscalls.c
index 8fdc69fa703..5803db5f813 100644
--- a/regress/sys/kern/pledge/pledgepath/syscalls.c
+++ b/regress/sys/kern/pledge/pledgepath/syscalls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscalls.c,v 1.20 2018/04/27 12:07:36 beck Exp $ */
+/* $OpenBSD: syscalls.c,v 1.21 2018/04/27 15:28:00 beck Exp $ */
/*
* Copyright (c) 2017 Bob Beck <beck@openbsd.org>
@@ -312,6 +312,8 @@ test_unlink(int do_pp)
if (do_pp) {
printf("testing unlink\n");
do_pledgepath();
+ if (pledgepath(filename3, "rw") == -1)
+ err(1, "%s:%d - pledgepath", __FILE__, __LINE__);
}
PP_SHOULD_SUCCEED((pledge("paths stdio fattr rpath cpath wpath", NULL) == -1),
@@ -319,13 +321,6 @@ test_unlink(int do_pp)
PP_SHOULD_SUCCEED((unlink(filename1) == -1), "unlink");
PP_SHOULD_FAIL((unlink(filename2) == -1), "unlink");
PP_SHOULD_FAIL((unlink(filename3) == -1), "unlink");
- if (do_pp) {
- printf("testing unlink without O_CREAT\n");
- if (pledgepath(filename3, "rw") == -1)
- err(1, "%s:%d - pledgepath", __FILE__, __LINE__);
-
- }
- PP_SHOULD_FAIL((unlink(filename3) == -1), "unlink");
return 0;
}