From 97cce3269cdd0318e6254c2b6dbc40c2fa9ac8d0 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Tue, 3 May 2005 20:21:24 +0000 Subject: [PATCH] Move definitions of 'struct kuser' and 'struct ksem' from uipc_sem.c to ksem.h so that they are accessible from the MAC Framework for the purposes of labeling and enforcing additional protections. #error if these are included without _KERNEL, since they are not intended (nor installed) for user application use. Submitted by: Dandekar Hrishikesh Sponsored by: DARPA, SPARTA Obtained from: TrustedBSD Project --- sys/kern/uipc_sem.c | 20 +---------------- sys/posix4/ksem.h | 55 +++++++++++++++++++++++++++++++++++++++++++++ sys/sys/ksem.h | 55 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 19 deletions(-) create mode 100644 sys/posix4/ksem.h create mode 100644 sys/sys/ksem.h diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index 5366f3a531a1..ea5dedc98fee 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -86,25 +87,6 @@ static int kern_sem_unlink(struct thread *td, const char *name); #define SEM_TO_ID(x) ((intptr_t)(x)) #define ID_TO_SEM(x) id_to_sem(x) -struct kuser { - pid_t ku_pid; - LIST_ENTRY(kuser) ku_next; -}; - -struct ksem { - LIST_ENTRY(ksem) ks_entry; /* global list entry */ - int ks_onlist; /* boolean if on a list (ks_entry) */ - char *ks_name; /* if named, this is the name */ - int ks_ref; /* number of references */ - mode_t ks_mode; /* protection bits */ - uid_t ks_uid; /* creator uid */ - gid_t ks_gid; /* creator gid */ - unsigned int ks_value; /* current value */ - struct cv ks_cv; /* waiters sleep here */ - int ks_waiters; /* number of waiters */ - LIST_HEAD(, kuser) ks_users; /* pids using this sem */ -}; - /* * available semaphores go here, this includes sem_init and any semaphores * created via sem_open that have not yet been unlinked. diff --git a/sys/posix4/ksem.h b/sys/posix4/ksem.h new file mode 100644 index 000000000000..29b0a53482fc --- /dev/null +++ b/sys/posix4/ksem.h @@ -0,0 +1,55 @@ +/*- + * Copyright (c) 2002 Alfred Perlstein + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _POSIX4_KSEM_H_ +#define _POSIX4_KSEM_H_ + +#ifndef _KERNEL +#error "no user-servicable parts inside" +#endif + +struct kuser { + pid_t ku_pid; + LIST_ENTRY(kuser) ku_next; +}; + +struct ksem { + LIST_ENTRY(ksem) ks_entry; /* global list entry */ + int ks_onlist; /* boolean if on a list (ks_entry) */ + char *ks_name; /* if named, this is the name */ + int ks_ref; /* number of references */ + mode_t ks_mode; /* protection bits */ + uid_t ks_uid; /* creator uid */ + gid_t ks_gid; /* creator gid */ + unsigned int ks_value; /* current value */ + struct cv ks_cv; /* waiters sleep here */ + int ks_waiters; /* number of waiters */ + LIST_HEAD(, kuser) ks_users; /* pids using this sem */ +}; + +#endif /* !_POSIX4_KSEM_H_ */ diff --git a/sys/sys/ksem.h b/sys/sys/ksem.h new file mode 100644 index 000000000000..29b0a53482fc --- /dev/null +++ b/sys/sys/ksem.h @@ -0,0 +1,55 @@ +/*- + * Copyright (c) 2002 Alfred Perlstein + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _POSIX4_KSEM_H_ +#define _POSIX4_KSEM_H_ + +#ifndef _KERNEL +#error "no user-servicable parts inside" +#endif + +struct kuser { + pid_t ku_pid; + LIST_ENTRY(kuser) ku_next; +}; + +struct ksem { + LIST_ENTRY(ksem) ks_entry; /* global list entry */ + int ks_onlist; /* boolean if on a list (ks_entry) */ + char *ks_name; /* if named, this is the name */ + int ks_ref; /* number of references */ + mode_t ks_mode; /* protection bits */ + uid_t ks_uid; /* creator uid */ + gid_t ks_gid; /* creator gid */ + unsigned int ks_value; /* current value */ + struct cv ks_cv; /* waiters sleep here */ + int ks_waiters; /* number of waiters */ + LIST_HEAD(, kuser) ks_users; /* pids using this sem */ +}; + +#endif /* !_POSIX4_KSEM_H_ */