diff options
| -rw-r--r-- | sys/kern/kern_unveil.c | 5 | ||||
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 7 | ||||
| -rw-r--r-- | sys/sys/namei.h | 7 |
3 files changed, 8 insertions, 11 deletions
diff --git a/sys/kern/kern_unveil.c b/sys/kern/kern_unveil.c index ac82d5a7478..0c88a3a889e 100644 --- a/sys/kern/kern_unveil.c +++ b/sys/kern/kern_unveil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_unveil.c,v 1.30 2019/08/01 15:09:25 bluhm Exp $ */ +/* $OpenBSD: kern_unveil.c,v 1.31 2019/08/02 08:12:35 bluhm Exp $ */ /* * Copyright (c) 2017-2019 Bob Beck <beck@openbsd.org> @@ -43,9 +43,6 @@ #define UNVEIL_MAX_VNODES 128 #define UNVEIL_MAX_NAMES 128 -struct unveil *unveil_lookup(struct vnode *vp, struct proc *p, - ssize_t *position); - static inline int unvname_compare(const struct unvname *n1, const struct unvname *n2) { diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index ff230f1677e..0c8c55b857f 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_syscalls.c,v 1.327 2019/07/25 01:43:21 cheloha Exp $ */ +/* $OpenBSD: vfs_syscalls.c,v 1.328 2019/08/02 08:12:35 bluhm Exp $ */ /* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */ /* @@ -90,11 +90,6 @@ int doutimensat(struct proc *, int, const char *, struct timespec [2], int); int dovutimens(struct proc *, struct vnode *, struct timespec [2]); int dofutimens(struct proc *, int, struct timespec [2]); int dounmount_leaf(struct mount *, int, struct proc *); -int unveil_add(struct proc *, struct nameidata *, const char *); -void unveil_removevnode(struct vnode *vp); -void unveil_free_traversed_vnodes(struct nameidata *); -ssize_t unveil_find_cover(struct vnode *, struct proc *); -struct unveil *unveil_lookup(struct vnode *, struct proc *, ssize_t *); /* * Virtual File System System Calls diff --git a/sys/sys/namei.h b/sys/sys/namei.h index 874d7eeacc9..593432ebf70 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -1,4 +1,4 @@ -/* $OpenBSD: namei.h,v 1.41 2019/07/27 21:15:36 bluhm Exp $ */ +/* $OpenBSD: namei.h,v 1.42 2019/08/02 08:12:35 bluhm Exp $ */ /* $NetBSD: namei.h,v 1.11 1996/02/09 18:25:20 christos Exp $ */ /* @@ -204,6 +204,11 @@ void nchinit(void); struct mount; void cache_purgevfs(struct mount *); +int unveil_add(struct proc *, struct nameidata *, const char *); +void unveil_removevnode(struct vnode *); +void unveil_free_traversed_vnodes(struct nameidata *); +ssize_t unveil_find_cover(struct vnode *, struct proc *); +struct unveil *unveil_lookup(struct vnode *, struct proc *, ssize_t *); void unveil_start_relative(struct proc *, struct nameidata *); void unveil_check_component(struct proc *, struct nameidata *, struct vnode *); int unveil_check_final(struct proc *, struct nameidata *); |