diff options
| author |   semarie <semarie@openbsd.org> | 2015-10-16 14:04:11 +0000 |
|---|---|---|
| committer | semarie <semarie@openbsd.org> | 2015-10-16 14:04:11 +0000 |
| commit | eca9e229172cad541818effda99d1c382e9ce9a4 (patch) | |
| tree | 8ba79a42bde58f5da6e1238454c775d381fda07d /sys/kern/kern_pledge.c | |
| parent | Place TIOCSTI reminder block better (diff) | |
| download | wireguard-openbsd-eca9e229172cad541818effda99d1c382e9ce9a4.tar.xz wireguard-openbsd-eca9e229172cad541818effda99d1c382e9ce9a4.zip | |
delete pledge_bind_check() function and remove pledge_bind_check() call from sys_bind().
bind(2) still require PLEDGE_INET or PLEDGE_UNIX in order to be called, due to
SYS_bind entry in pledge_syscalls array. The diff restores also the ability for
PLEDGE_UNIX to call bind(2) (pledge_bind_check function missed that).
problem spotted by doug@
OK deraadt@
Diffstat (limited to 'sys/kern/kern_pledge.c')
| -rw-r--r-- | sys/kern/kern_pledge.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index ee0c65ce503..b3e3f298615 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.35 2015/10/16 14:00:37 deraadt Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.36 2015/10/16 14:04:11 semarie Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -1004,17 +1004,6 @@ pledge_socket_check(struct proc *p, int domain) } int -pledge_bind_check(struct proc *p, const void *v) -{ - - if ((p->p_p->ps_flags & PS_PLEDGE) == 0) - return (0); - if ((p->p_p->ps_pledge & PLEDGE_INET)) - return (0); - return (EPERM); -} - -int pledge_ioctl_check(struct proc *p, long com, void *v) { struct file *fp = v; |