diff options
| author |   semarie <semarie@openbsd.org> | 2015-11-01 19:03:33 +0000 |
|---|---|---|
| committer | semarie <semarie@openbsd.org> | 2015-11-01 19:03:33 +0000 |
| commit | a48a073ba1787363f8d1ab841c9aab3fc1ec3e2e (patch) | |
| tree | 6abe08d847edcf877a0f9b06ebee4e5a25a5dc3d /sys/kern/kern_time.c | |
| parent | pledge m4. tested by me. (diff) | |
| download | wireguard-openbsd-a48a073ba1787363f8d1ab841c9aab3fc1ec3e2e.tar.xz wireguard-openbsd-a48a073ba1787363f8d1ab841c9aab3fc1ec3e2e.zip | |
refactor pledge_*_check and pledge_fail functions
- rename _check function without suffix: a "pledge" function called from
anywhere is a "check" function.
- makes pledge_fail call the responsability to the _check function. remove it
from caller.
- make proper use of (potential) returned error of _check() functions.
- adds pledge_kill() and pledge_protexec()
with and OK deraadt@
Diffstat (limited to 'sys/kern/kern_time.c')
| -rw-r--r-- | sys/kern/kern_time.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 3aab66ce4d9..674a1c8e092 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_time.c,v 1.94 2015/10/09 01:10:27 deraadt Exp $ */ +/* $OpenBSD: kern_time.c,v 1.95 2015/11/01 19:03:33 semarie Exp $ */ /* $NetBSD: kern_time.c,v 1.20 1996/02/18 11:57:06 fvdl Exp $ */ /* @@ -433,8 +433,9 @@ sys_adjtime(struct proc *p, void *v, register_t *retval) struct timeval atv; int error; - if (pledge_adjtime_check(p, delta)) - return (EPERM); + error = pledge_adjtime(p, delta); + if (error) + return error; if (olddelta) { memset(&atv, 0, sizeof(atv)); |