summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_pledge.c
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2015-10-14 14:24:03 +0000
committerderaadt <deraadt@openbsd.org>2015-10-14 14:24:03 +0000
commit702d2838f25005ccab83bea99b9abd39276da75d (patch)
tree5399ff5787f57e45337a2e09c11d4fdd7da97064 /sys/kern/kern_pledge.c
parentadd includes for crc32() and uuid_dec_be() missed in rev 1.11 (diff)
downloadwireguard-openbsd-702d2838f25005ccab83bea99b9abd39276da75d.tar.xz
wireguard-openbsd-702d2838f25005ccab83bea99b9abd39276da75d.zip
When pledged with "fattr", allow chown to supplimentary groups. This
came out of a discussion regarding "sort foo -o foo". ok semarie
Diffstat (limited to 'sys/kern/kern_pledge.c')
-rw-r--r--sys/kern/kern_pledge.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c
index c36ae6b500e..b37f95ab73c 100644
--- a/sys/kern/kern_pledge.c
+++ b/sys/kern/kern_pledge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_pledge.c,v 1.24 2015/10/14 04:05:43 deraadt Exp $ */
+/* $OpenBSD: kern_pledge.c,v 1.25 2015/10/14 14:24:03 deraadt Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -913,6 +913,18 @@ pledge_sysctl_check(struct proc *p, int miblen, int *mib, void *new)
}
int
+pledge_chown_check(struct proc *p, uid_t uid, gid_t gid)
+{
+ if ((p->p_p->ps_flags & PS_PLEDGE) == 0)
+ return (0);
+ if (uid != -1 && uid != p->p_ucred->cr_uid)
+ return (EPERM);
+ if (gid != -1 && !groupmember(gid, p->p_ucred))
+ return (EPERM);
+ return (0);
+}
+
+int
pledge_adjtime_check(struct proc *p, const void *v)
{
const struct timeval *delta = v;