Add thread safety wrappers for the posix1e syscalls that deal with file

descriptors.

Approved by:	rwatson
Obtained from:	TrustedBSD Project

10 files changed, 369 insertions, 0 deletions

diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h
index 8e04bd5..e212a0b 100644
--- a/lib/libc_r/uthread/pthread_private.h
+++ b/lib/libc_r/uthread/pthread_private.h
@@ -1396,6 +1396,20 @@ extern void	__siglongjmp(sigjmp_buf, int) __dead2;
 extern void	__longjmp(jmp_buf, int) __dead2;
 extern void	___longjmp(jmp_buf, int) __dead2;
 #endif
+
+/* #include <sys/capability.h> */
+#ifdef _SYS_CAPABILITY_H
+int	__sys___cap_get_fd(int, struct cap *);
+int	__sys___cap_set_fd(int, struct cap *);
+#endif
+
+/* #include <sys/acl.h> */
+#ifdef _SYS_ACL_H
+int	__sys___acl_aclcheck_fd(int, acl_type_t, struct acl *);
+int	__sys___acl_delete_fd(int, acl_type_t);
+int	__sys___acl_get_fd(int, acl_type_t, struct acl *);
+int	__sys___acl_set_fd(int, acl_type_t, struct acl *);
+#endif
 __END_DECLS
 
 #endif  /* !_PTHREAD_PRIVATE_H */
diff --git a/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c b/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c
new file mode 100644
index 0000000..af28bfa
--- /dev/null
+++ b/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c
@@ -0,0 +1,47 @@
+/*-
+ * Copyright (c) 2001 Thomas Moestl
+ * 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$
+ */
+
+#include <sys/types.h>
+#include <sys/acl.h>
+#include <pthread.h>
+#include "pthread_private.h"
+
+#pragma weak __acl_aclcheck_fd=___acl_aclcheck_fd
+
+int
+___acl_aclcheck_fd(int fd, acl_type_t tp, acl_t acl)
+{
+	int	error;
+
+	if ((error = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
+		error = __sys___acl_aclcheck_fd(fd, tp, acl);
+		_FD_UNLOCK(fd, FD_READ);
+	}
+	return (error);
+}
+
diff --git a/lib/libc_r/uthread/uthread_acl_delete_fd.c b/lib/libc_r/uthread/uthread_acl_delete_fd.c
new file mode 100644
index 0000000..9e1f16b
--- /dev/null
+++ b/lib/libc_r/uthread/uthread_acl_delete_fd.c
@@ -0,0 +1,46 @@
+/*-
+ * Copyright (c) 2001 Thomas Moestl
+ * 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$
+ */
+
+#include <sys/types.h>
+#include <sys/acl.h>
+#include <pthread.h>
+#include "pthread_private.h"
+
+#pragma weak __acl_delete_fd=___acl_delete_fd
+
+int
+___acl_delete_fd(int fd, acl_type_t tp)
+{
+	int error;
+
+	if ((error = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
+		error = __sys___acl_delete_fd(fd, tp);
+		_FD_UNLOCK(fd, FD_WRITE);
+	}
+	return (error);
+}
diff --git a/lib/libc_r/uthread/uthread_acl_get_fd.c b/lib/libc_r/uthread/uthread_acl_get_fd.c
new file mode 100644
index 0000000..dbdfb3d
--- /dev/null
+++ b/lib/libc_r/uthread/uthread_acl_get_fd.c
@@ -0,0 +1,47 @@
+/*-
+ * Copyright (c) 2001 Thomas Moestl
+ * 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$
+ */
+
+#include <sys/types.h>
+#include <sys/acl.h>
+#include <pthread.h>
+#include "pthread_private.h"
+
+#pragma weak __acl_get_fd=___acl_get_fd
+
+int
+___acl_get_fd(int fd, acl_type_t tp, struct acl *acl_p)
+{
+	int	error;
+
+	if ((error = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
+		error = __sys___acl_get_fd(fd, tp, acl_p);
+		_FD_UNLOCK(fd, FD_READ);
+	}
+	return (error);
+
+}
diff --git a/lib/libc_r/uthread/uthread_acl_set_fd.c b/lib/libc_r/uthread/uthread_acl_set_fd.c
new file mode 100644
index 0000000..24f41d5
--- /dev/null
+++ b/lib/libc_r/uthread/uthread_acl_set_fd.c
@@ -0,0 +1,46 @@
+/*-
+ * Copyright (c) 2001 Thomas Moestl
+ * 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$
+ */
+
+#include <sys/types.h>
+#include <sys/acl.h>
+#include <pthread.h>
+#include "pthread_private.h"
+
+#pragma weak __acl_set_fd=___acl_set_fd
+
+int
+___acl_set_fd(int fd, acl_type_t tp, struct acl *acl_p)
+{
+	int	error;
+
+	if ((error = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
+		error = __sys___acl_set_fd(fd, tp, acl_p);
+		_FD_UNLOCK(fd, FD_WRITE);
+	}
+	return (error);
+}
diff --git a/lib/libc_r/uthread/uthread_cap_get_fd.c b/lib/libc_r/uthread/uthread_cap_get_fd.c
new file mode 100644
index 0000000..7d42917
--- /dev/null
+++ b/lib/libc_r/uthread/uthread_cap_get_fd.c
@@ -0,0 +1,48 @@
+/*-
+ * Copyright (c) 2001 Thomas Moestl
+ * 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$
+ */
+
+#include <sys/types.h>
+#include <sys/capability.h>
+#include <pthread.h>
+#include "pthread_private.h"
+
+#pragma weak __cap_get_fd=___cap_get_fd
+
+int
+___cap_get_fd(int fd, struct cap *cap_p)
+{
+	int	error;
+
+	if ((error = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
+		error = __sys___cap_get_fd(fd, cap_p);
+		_FD_UNLOCK(fd, FD_READ);
+	}
+	return (error);
+}
+
+
diff --git a/lib/libc_r/uthread/uthread_cap_set_fd.c b/lib/libc_r/uthread/uthread_cap_set_fd.c
new file mode 100644
index 0000000..e911b6b
--- /dev/null
+++ b/lib/libc_r/uthread/uthread_cap_set_fd.c
@@ -0,0 +1,46 @@
+/*-
+ * Copyright (c) 2001 Thomas Moestl
+ * 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$
+ */
+
+#include <sys/types.h>
+#include <sys/capability.h>
+#include <pthread.h>
+#include "pthread_private.h"
+
+#pragma weak __cap_set_fd=___cap_set_fd
+
+int
+___cap_set_fd(int fd, cap_t cap_p)
+{
+	int error;
+
+	if ((error = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
+		error = __sys___cap_set_fd(fd, cap_p);
+		_FD_UNLOCK(fd, FD_WRITE);
+	}
+	return (error);
+}
diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h
index 8e04bd5..e212a0b 100644
--- a/lib/libkse/thread/thr_private.h
+++ b/lib/libkse/thread/thr_private.h
@@ -1396,6 +1396,20 @@ extern void	__siglongjmp(sigjmp_buf, int) __dead2;
 extern void	__longjmp(jmp_buf, int) __dead2;
 extern void	___longjmp(jmp_buf, int) __dead2;
 #endif
+
+/* #include <sys/capability.h> */
+#ifdef _SYS_CAPABILITY_H
+int	__sys___cap_get_fd(int, struct cap *);
+int	__sys___cap_set_fd(int, struct cap *);
+#endif
+
+/* #include <sys/acl.h> */
+#ifdef _SYS_ACL_H
+int	__sys___acl_aclcheck_fd(int, acl_type_t, struct acl *);
+int	__sys___acl_delete_fd(int, acl_type_t);
+int	__sys___acl_get_fd(int, acl_type_t, struct acl *);
+int	__sys___acl_set_fd(int, acl_type_t, struct acl *);
+#endif
 __END_DECLS
 
 #endif  /* !_PTHREAD_PRIVATE_H */
diff --git a/lib/libpthread/thread/thr_acl_aclcheck_fd.c b/lib/libpthread/thread/thr_acl_aclcheck_fd.c
new file mode 100644
index 0000000..af28bfa
--- /dev/null
+++ b/lib/libpthread/thread/thr_acl_aclcheck_fd.c
@@ -0,0 +1,47 @@
+/*-
+ * Copyright (c) 2001 Thomas Moestl
+ * 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$
+ */
+
+#include <sys/types.h>
+#include <sys/acl.h>
+#include <pthread.h>
+#include "pthread_private.h"
+
+#pragma weak __acl_aclcheck_fd=___acl_aclcheck_fd
+
+int
+___acl_aclcheck_fd(int fd, acl_type_t tp, acl_t acl)
+{
+	int	error;
+
+	if ((error = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
+		error = __sys___acl_aclcheck_fd(fd, tp, acl);
+		_FD_UNLOCK(fd, FD_READ);
+	}
+	return (error);
+}
+
diff --git a/lib/libpthread/thread/thr_private.h b/lib/libpthread/thread/thr_private.h
index 8e04bd5..e212a0b 100644
--- a/lib/libpthread/thread/thr_private.h
+++ b/lib/libpthread/thread/thr_private.h
@@ -1396,6 +1396,20 @@ extern void	__siglongjmp(sigjmp_buf, int) __dead2;
 extern void	__longjmp(jmp_buf, int) __dead2;
 extern void	___longjmp(jmp_buf, int) __dead2;
 #endif
+
+/* #include <sys/capability.h> */
+#ifdef _SYS_CAPABILITY_H
+int	__sys___cap_get_fd(int, struct cap *);
+int	__sys___cap_set_fd(int, struct cap *);
+#endif
+
+/* #include <sys/acl.h> */
+#ifdef _SYS_ACL_H
+int	__sys___acl_aclcheck_fd(int, acl_type_t, struct acl *);
+int	__sys___acl_delete_fd(int, acl_type_t);
+int	__sys___acl_get_fd(int, acl_type_t, struct acl *);
+int	__sys___acl_set_fd(int, acl_type_t, struct acl *);
+#endif
 __END_DECLS
 
 #endif  /* !_PTHREAD_PRIVATE_H */