summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2015-10-06 14:38:24 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2015-10-06 14:38:24 +0000
commit05729edf7be50a8bca84376859afaba905094dff (patch)
tree8d227e4a55904a9aebb2117c1ad1855b9f606b10 /sys/kern
parent142b18643ee835df9deb1b31336fbb25279d5ab5 (diff)
oops, namei was never allowing through valid CPATH operations
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_tame.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/kern_tame.c b/sys/kern/kern_tame.c
index 75eb3cf77ce..5d0370dad3b 100644
--- a/sys/kern/kern_tame.c
+++ b/sys/kern/kern_tame.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_tame.c,v 1.59 2015/10/06 14:02:49 deraadt Exp $ */
+/* $OpenBSD: kern_tame.c,v 1.60 2015/10/06 14:38:23 deraadt Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -650,9 +650,10 @@ tame_namei(struct proc *p, char *origpath)
if (p->p_p->ps_tame & TAME_RPATH)
return (0);
-
if (p->p_p->ps_tame & TAME_WPATH)
return (0);
+ if (p->p_p->ps_tame & TAME_CPATH)
+ return (0);
return (tame_fail(p, EPERM, TAME_RPATH));
}