PERFORCE change 153771 for review
Marko Zec
zec at FreeBSD.org
Sun Nov 30 08:29:54 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=153771
Change 153771 by zec at zec_tpx32 on 2008/11/29 17:39:12
IFC @ 153769
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_machdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_syscall.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysent.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/syscalls.master#3 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#10 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/asmc/asmc.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/k8temp/k8temp.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mii/truephy.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/linux/linux.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_cpuset.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_fork.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/include/atomic.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/powermac_nvram/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if.c#26 integrate
.. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#28 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#26 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsubs.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/cpuset.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/jail.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/mount.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/param.h#22 integrate
Differences ...
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#5 (text+ko) ====
@@ -27,7 +27,7 @@
* (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: src/sys/amd64/linux32/linux.h,v 1.20 2008/11/16 15:45:41 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.22 2008/11/29 17:14:06 kib Exp $
*/
#ifndef _AMD64_LINUX_H_
@@ -717,6 +717,22 @@
char sa_data[14];
} __packed;
+struct l_msghdr {
+ l_uintptr_t msg_name;
+ l_int msg_namelen;
+ l_uintptr_t msg_iov;
+ l_size_t msg_iovlen;
+ l_uintptr_t msg_control;
+ l_size_t msg_controllen;
+ l_uint msg_flags;
+};
+
+struct l_cmsghdr {
+ l_size_t cmsg_len;
+ l_int cmsg_level;
+ l_int cmsg_type;
+};
+
struct l_ifmap {
l_ulong mem_start;
l_ulong mem_end;
@@ -885,6 +901,16 @@
(LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES | \
LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD)
+struct iovec;
+
+struct l_iovec32 {
+ uint32_t iov_base;
+ l_size_t iov_len;
+};
+
+int linux32_copyiniov(struct l_iovec32 *iovp32, l_ulong iovcnt,
+ struct iovec **iovp, int error);
+
/* robust futexes */
struct linux_robust_list {
l_uintptr_t next;
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_machdep.c#5 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.50 2008/11/11 14:55:59 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.51 2008/11/29 14:55:24 kib Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -232,20 +232,15 @@
return (error);
}
-struct iovec32 {
- u_int32_t iov_base;
- int iov_len;
-};
-
-CTASSERT(sizeof(struct iovec32) == 8);
+CTASSERT(sizeof(struct l_iovec32) == 8);
static int
-linux32_copyinuio(struct iovec32 *iovp, u_int iovcnt, struct uio **uiop)
+linux32_copyinuio(struct l_iovec32 *iovp, l_ulong iovcnt, struct uio **uiop)
{
- struct iovec32 iov32;
+ struct l_iovec32 iov32;
struct iovec *iov;
struct uio *uio;
- u_int iovlen;
+ uint32_t iovlen;
int error, i;
*uiop = NULL;
@@ -255,7 +250,7 @@
uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK);
iov = (struct iovec *)(uio + 1);
for (i = 0; i < iovcnt; i++) {
- error = copyin(&iovp[i], &iov32, sizeof(struct iovec32));
+ error = copyin(&iovp[i], &iov32, sizeof(struct l_iovec32));
if (error) {
free(uio, M_IOV);
return (error);
@@ -281,6 +276,34 @@
}
int
+linux32_copyiniov(struct l_iovec32 *iovp32, l_ulong iovcnt, struct iovec **iovp,
+ int error)
+{
+ struct l_iovec32 iov32;
+ struct iovec *iov;
+ uint32_t iovlen;
+ int i;
+
+ *iovp = NULL;
+ if (iovcnt > UIO_MAXIOV)
+ return (error);
+ iovlen = iovcnt * sizeof(struct iovec);
+ iov = malloc(iovlen, M_IOV, M_WAITOK);
+ for (i = 0; i < iovcnt; i++) {
+ error = copyin(&iovp32[i], &iov32, sizeof(struct l_iovec32));
+ if (error) {
+ free(iov, M_IOV);
+ return (error);
+ }
+ iov[i].iov_base = PTRIN(iov32.iov_base);
+ iov[i].iov_len = iov32.iov_len;
+ }
+ *iovp = iov;
+ return(0);
+
+}
+
+int
linux_readv(struct thread *td, struct linux_readv_args *uap)
{
struct uio *auio;
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.38 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.39 2008/11/29 14:57:58 kib Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -455,14 +455,14 @@
char fl_l_[PADL_(l_int)]; l_int fl; char fl_r_[PADR_(l_int)];
};
struct linux_readv_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
- char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
+ char fd_l_[PADL_(l_ulong)]; l_ulong fd; char fd_r_[PADR_(l_ulong)];
+ char iovp_l_[PADL_(struct l_iovec32 *)]; struct l_iovec32 * iovp; char iovp_r_[PADR_(struct l_iovec32 *)];
+ char iovcnt_l_[PADL_(l_ulong)]; l_ulong iovcnt; char iovcnt_r_[PADR_(l_ulong)];
};
struct linux_writev_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
- char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
+ char fd_l_[PADL_(l_ulong)]; l_ulong fd; char fd_r_[PADR_(l_ulong)];
+ char iovp_l_[PADL_(struct l_iovec32 *)]; struct l_iovec32 * iovp; char iovp_r_[PADR_(struct l_iovec32 *)];
+ char iovcnt_l_[PADL_(l_ulong)]; l_ulong iovcnt; char iovcnt_r_[PADR_(l_ulong)];
};
struct linux_getsid_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_syscall.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.38 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.39 2008/11/29 14:57:58 kib Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib
*/
#define LINUX_SYS_exit 1
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysent.c#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.38 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.39 2008/11/29 14:57:58 kib Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib
*/
#include "opt_compat.h"
==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/syscalls.master#3 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.35 2008/11/09 10:45:13 ed Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.36 2008/11/29 14:55:24 kib Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -252,10 +252,10 @@
143 AUE_FLOCK NOPROTO { int flock(int fd, int how); }
144 AUE_MSYNC STD { int linux_msync(l_ulong addr, \
l_size_t len, l_int fl); }
-145 AUE_READV STD { int linux_readv(int fd, struct iovec32 *iovp, \
- u_int iovcnt); }
-146 AUE_WRITEV STD { int linux_writev(int fd, struct iovec32 *iovp, \
- u_int iovcnt); }
+145 AUE_READV STD { int linux_readv(l_ulong fd, struct l_iovec32 *iovp, \
+ l_ulong iovcnt); }
+146 AUE_WRITEV STD { int linux_writev(l_ulong fd, struct l_iovec32 *iovp, \
+ l_ulong iovcnt); }
147 AUE_GETSID STD { int linux_getsid(l_pid_t pid); }
148 AUE_NULL STD { int linux_fdatasync(l_uint fd); }
149 AUE_SYSCTL STD { int linux_sysctl( \
==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/vnode.h,v 1.8 2008/11/25 21:14:00 pjd Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/vnode.h,v 1.9 2008/11/29 12:32:42 pjd Exp $
*/
#ifndef _OPENSOLARIS_SYS_VNODE_H_
@@ -257,7 +257,6 @@
{
int error, vfslocked;
- ASSERT(flag == (FWRITE | FCREAT | FTRUNC | FOFFMAX));
ASSERT(count == 1);
ASSERT(offset == 0);
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.7 2007/12/06 23:11:27 jhb Exp $
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.8 2008/11/29 14:32:14 bz Exp $
*/
#ifndef _COMPAT_FREEBSD32_FREEBSD32_H_
@@ -153,6 +153,24 @@
unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32));
};
+struct jail32_v0 {
+ u_int32_t version;
+ uint32_t path;
+ uint32_t hostname;
+ u_int32_t ip_number;
+};
+
+struct jail32 {
+ uint32_t version;
+ uint32_t path;
+ uint32_t hostname;
+ uint32_t jailname;
+ uint32_t ip4s;
+ uint32_t ip6s;
+ uint32_t ip4;
+ uint32_t ip6;
+};
+
struct sigaction32 {
u_int32_t sa_u;
int sa_flags;
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.83 2008/11/10 23:36:20 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.84 2008/11/29 14:32:14 bz Exp $");
#include "opt_compat.h"
@@ -36,6 +36,7 @@
#include <sys/fcntl.h>
#include <sys/filedesc.h>
#include <sys/imgact.h>
+#include <sys/jail.h>
#include <sys/kernel.h>
#include <sys/limits.h>
#include <sys/lock.h>
@@ -2036,6 +2037,66 @@
}
int
+freebsd32_jail(struct thread *td, struct freebsd32_jail_args *uap)
+{
+ uint32_t version;
+ int error;
+ struct jail j;
+
+ error = copyin(uap->jail, &version, sizeof(uint32_t));
+ if (error)
+ return (error);
+ switch (version) {
+ case 0:
+ {
+ /* FreeBSD single IPv4 jails. */
+ struct jail32_v0 j32_v0;
+
+ bzero(&j, sizeof(struct jail));
+ error = copyin(uap->jail, &j32_v0, sizeof(struct jail32_v0));
+ if (error)
+ return (error);
+ CP(j32_v0, j, version);
+ PTRIN_CP(j32_v0, j, path);
+ PTRIN_CP(j32_v0, j, hostname);
+ j.ip4s = j32_v0.ip_number;
+ break;
+ }
+
+ case 1:
+ /*
+ * Version 1 was used by multi-IPv4 jail implementations
+ * that never made it into the official kernel.
+ */
+ return (EINVAL);
+
+ case 2: /* JAIL_API_VERSION */
+ {
+ /* FreeBSD multi-IPv4/IPv6,noIP jails. */
+ struct jail32 j32;
+
+ error = copyin(uap->jail, &j32, sizeof(struct jail32));
+ if (error)
+ return (error);
+ CP(j32, j, version);
+ PTRIN_CP(j32, j, path);
+ PTRIN_CP(j32, j, hostname);
+ PTRIN_CP(j32, j, jailname);
+ CP(j32, j, ip4s);
+ CP(j32, j, ip6s);
+ PTRIN_CP(j32, j, ip4);
+ PTRIN_CP(j32, j, ip6);
+ break;
+ }
+
+ default:
+ /* Sci-Fi jails are not supported, sorry. */
+ return (EINVAL);
+ }
+ return (kern_jail(td, &j));
+}
+
+int
freebsd32_sigaction(struct thread *td, struct freebsd32_sigaction_args *uap)
{
struct sigaction32 s32;
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#10 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.96 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.97 2008/11/29 14:34:30 bz Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -235,6 +235,9 @@
char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)];
char stat_l_[PADL_(struct module_stat32 *)]; struct module_stat32 * stat; char stat_r_[PADR_(struct module_stat32 *)];
};
+struct freebsd32_jail_args {
+ char jail_l_[PADL_(struct jail32 *)]; struct jail32 * jail; char jail_r_[PADR_(struct jail32 *)];
+};
struct freebsd32_sigtimedwait_args {
char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
@@ -428,6 +431,7 @@
int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *);
int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *);
int freebsd32_modstat(struct thread *, struct freebsd32_modstat_args *);
+int freebsd32_jail(struct thread *, struct freebsd32_jail_args *);
int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *);
int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *);
int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *);
@@ -641,6 +645,7 @@
#define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV
#define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV
#define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_jail AUE_JAIL
#define FREEBSD32_SYS_AUE_freebsd32_sigtimedwait AUE_SIGWAIT
#define FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#10 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.95 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.96 2008/11/29 14:34:30 bz Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz
*/
#define FREEBSD32_SYS_syscall 0
@@ -254,7 +254,7 @@
#define FREEBSD32_SYS_utrace 335
#define FREEBSD32_SYS_freebsd4_freebsd32_sendfile 336
#define FREEBSD32_SYS_kldsym 337
-#define FREEBSD32_SYS_jail 338
+#define FREEBSD32_SYS_freebsd32_jail 338
#define FREEBSD32_SYS_sigprocmask 340
#define FREEBSD32_SYS_sigsuspend 341
#define FREEBSD32_SYS_freebsd4_freebsd32_sigaction 342
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.86 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.87 2008/11/29 14:34:30 bz Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz
*/
const char *freebsd32_syscallnames[] = {
@@ -345,7 +345,7 @@
"utrace", /* 335 = utrace */
"compat4.freebsd32_sendfile", /* 336 = old freebsd32_sendfile */
"kldsym", /* 337 = kldsym */
- "jail", /* 338 = jail */
+ "freebsd32_jail", /* 338 = freebsd32_jail */
"#339", /* 339 = pioctl */
"sigprocmask", /* 340 = sigprocmask */
"sigsuspend", /* 341 = sigsuspend */
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#10 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.96 2008/11/09 10:48:06 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184789 2008-11-09 10:45:13Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.97 2008/11/29 14:34:30 bz Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz
*/
#include "opt_compat.h"
@@ -376,7 +376,7 @@
{ AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0 }, /* 335 = utrace */
{ compat4(AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_SENDFILE, NULL, 0, 0 }, /* 336 = old freebsd32_sendfile */
{ AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0 }, /* 337 = kldsym */
- { AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0 }, /* 338 = jail */
+ { AS(freebsd32_jail_args), (sy_call_t *)freebsd32_jail, AUE_JAIL, NULL, 0, 0 }, /* 338 = freebsd32_jail */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 339 = pioctl */
{ AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 340 = sigprocmask */
{ AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0 }, /* 341 = sigsuspend */
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#10 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.111 2008/11/09 10:45:13 ed Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.112 2008/11/29 14:32:14 bz Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -572,7 +572,7 @@
off_t *sbytes, int flags); }
337 AUE_NULL NOPROTO { int kldsym(int fileid, int cmd, \
void *data); }
-338 AUE_JAIL NOPROTO { int jail(struct jail *jail); }
+338 AUE_JAIL STD { int freebsd32_jail(struct jail32 *jail); }
339 AUE_NULL UNIMPL pioctl
340 AUE_SIGPROCMASK NOPROTO { int sigprocmask(int how, \
const sigset_t *set, sigset_t *oset); }
==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#10 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.78 2008/10/23 15:53:51 des Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.79 2008/11/29 17:14:06 kib Exp $");
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
@@ -421,10 +421,62 @@
}
static int
+linux_to_bsd_cmsg_type(int cmsg_type)
+{
+
+ switch (cmsg_type) {
+ case LINUX_SCM_RIGHTS:
+ return (SCM_RIGHTS);
+ }
+ return (-1);
+}
+
+static int
+bsd_to_linux_cmsg_type(int cmsg_type)
+{
+
+ switch (cmsg_type) {
+ case SCM_RIGHTS:
+ return (LINUX_SCM_RIGHTS);
+ }
+ return (-1);
+}
+
+
+
+static int
+linux_to_bsd_msghdr(struct msghdr *bhdr, const struct l_msghdr *lhdr)
+{
+ if (lhdr->msg_controllen > INT_MAX)
+ return (ENOBUFS);
+
+ bhdr->msg_name = PTRIN(lhdr->msg_name);
+ bhdr->msg_namelen = lhdr->msg_namelen;
+ bhdr->msg_iov = PTRIN(lhdr->msg_iov);
+ bhdr->msg_iovlen = lhdr->msg_iovlen;
+ bhdr->msg_control = PTRIN(lhdr->msg_control);
+ bhdr->msg_controllen = lhdr->msg_controllen;
+ bhdr->msg_flags = linux_to_bsd_msg_flags(lhdr->msg_flags);
+ return (0);
+}
+
+static int
+bsd_to_linux_msghdr(const struct msghdr *bhdr, struct l_msghdr *lhdr)
+{
+ lhdr->msg_name = PTROUT(bhdr->msg_name);
+ lhdr->msg_namelen = bhdr->msg_namelen;
+ lhdr->msg_iov = PTROUT(bhdr->msg_iov);
+ lhdr->msg_iovlen = bhdr->msg_iovlen;
+ lhdr->msg_control = PTROUT(bhdr->msg_control);
+ lhdr->msg_controllen = bhdr->msg_controllen;
+ /* msg_flags skipped */
+ return (0);
+}
+
+static int
linux_sendit(struct thread *td, int s, struct msghdr *mp, int flags,
- enum uio_seg segflg)
+ struct mbuf *control, enum uio_seg segflg)
{
- struct mbuf *control;
struct sockaddr *to;
int error;
@@ -436,27 +488,9 @@
} else
to = NULL;
- if (mp->msg_control != NULL) {
- struct cmsghdr *cmsg;
-
- if (mp->msg_controllen < sizeof(struct cmsghdr)) {
- error = EINVAL;
- goto bad;
- }
- error = sockargs(&control, mp->msg_control,
- mp->msg_controllen, MT_CONTROL);
- if (error)
- goto bad;
-
- cmsg = mtod(control, struct cmsghdr *);
- cmsg->cmsg_level = linux_to_bsd_sockopt_level(cmsg->cmsg_level);
- } else
- control = NULL;
-
error = kern_sendit(td, s, mp, linux_to_bsd_msg_flags(flags), control,
segflg);
-bad:
if (to)
free(to, M_SONAME);
return (error);
@@ -531,7 +565,7 @@
aiov[0].iov_base = (char *)packet;
aiov[0].iov_len = linux_args->len;
error = linux_sendit(td, linux_args->s, &msg, linux_args->flags,
- UIO_SYSSPACE);
+ NULL, UIO_SYSSPACE);
goout:
free(packet, M_TEMP);
return (error);
@@ -900,7 +934,8 @@
msg.msg_flags = 0;
aiov.iov_base = PTRIN(args->msg);
aiov.iov_len = args->len;
- error = linux_sendit(td, args->s, &msg, args->flags, UIO_USERSPACE);
+ error = linux_sendit(td, args->s, &msg, args->flags, NULL,
+ UIO_USERSPACE);
return (error);
}
@@ -962,13 +997,21 @@
static int
linux_sendmsg(struct thread *td, struct linux_sendmsg_args *args)
{
+ struct cmsghdr *cmsg;
+ struct mbuf *control;
struct msghdr msg;
+ struct l_cmsghdr linux_cmsg;
+ struct l_cmsghdr *ptr_cmsg;
+ struct l_msghdr linux_msg;
struct iovec *iov;
+ socklen_t datalen;
+ void *data;
int error;
- /* XXXTJR sendmsg is broken on amd64 */
-
- error = copyin(PTRIN(args->msg), &msg, sizeof(msg));
+ error = copyin(PTRIN(args->msg), &linux_msg, sizeof(linux_msg));
+ if (error)
+ return (error);
+ error = linux_to_bsd_msghdr(&msg, &linux_msg);
if (error)
return (error);
@@ -981,13 +1024,68 @@
*/
if (msg.msg_control != NULL && msg.msg_controllen == 0)
msg.msg_control = NULL;
+
+#ifdef COMPAT_LINUX32
+ error = linux32_copyiniov(PTRIN(msg.msg_iov), msg.msg_iovlen,
+ &iov, EMSGSIZE);
+#else
error = copyiniov(msg.msg_iov, msg.msg_iovlen, &iov, EMSGSIZE);
+#endif
if (error)
return (error);
+
+ if (msg.msg_control != NULL) {
+ error = ENOBUFS;
+ cmsg = malloc(CMSG_HDRSZ, M_TEMP, M_WAITOK | M_ZERO);
+ control = m_get(M_WAIT, MT_CONTROL);
+ if (control == NULL)
+ goto bad;
+ ptr_cmsg = LINUX_CMSG_FIRSTHDR(&msg);
+
+ do {
+ error = copyin(ptr_cmsg, &linux_cmsg,
+ sizeof(struct l_cmsghdr));
+ if (error)
+ goto bad;
+
+ error = EINVAL;
+ if (linux_cmsg.cmsg_len < sizeof(struct l_cmsghdr))
+ goto bad;
+
+ /*
+ * Now we support only SCM_RIGHTS, so return EINVAL
+ * in any other cmsg_type
+ */
+ if ((cmsg->cmsg_type =
+ linux_to_bsd_cmsg_type(linux_cmsg.cmsg_type)) == -1)
+ goto bad;
+ cmsg->cmsg_level =
+ linux_to_bsd_sockopt_level(linux_cmsg.cmsg_level);
+
+ datalen = linux_cmsg.cmsg_len - L_CMSG_HDRSZ;
+ cmsg->cmsg_len = CMSG_LEN(datalen);
+ data = LINUX_CMSG_DATA(ptr_cmsg);
+
+ error = ENOBUFS;
+ if (!m_append(control, CMSG_HDRSZ, (c_caddr_t) cmsg))
+ goto bad;
+ if (!m_append(control, datalen, (c_caddr_t) data))
+ goto bad;
+ } while ((ptr_cmsg = LINUX_CMSG_NXTHDR(&msg, ptr_cmsg)));
+ } else {
+ control = NULL;
+ cmsg = NULL;
+ }
+
msg.msg_iov = iov;
msg.msg_flags = 0;
- error = linux_sendit(td, args->s, &msg, args->flags, UIO_USERSPACE);
+ error = linux_sendit(td, args->s, &msg, args->flags, control,
+ UIO_USERSPACE);
+
+bad:
free(iov, M_IOV);
+ if (cmsg)
+ free(cmsg, M_TEMP);
return (error);
}
@@ -1000,44 +1098,132 @@
static int
linux_recvmsg(struct thread *td, struct linux_recvmsg_args *args)
{
- struct recvmsg_args /* {
- int s;
- struct msghdr *msg;
- int flags;
- } */ bsd_args;
+ struct cmsghdr *cm;
struct msghdr msg;
- struct cmsghdr *cmsg;
+ struct l_cmsghdr *linux_cmsg = NULL;
+ socklen_t datalen, outlen, clen;
+ struct l_msghdr linux_msg;
+ struct iovec *iov, *uiov;
+ struct mbuf *control = NULL;
+ struct mbuf **controlp;
+ caddr_t outbuf;
+ void *data;
int error;
- /* XXXTJR recvmsg is broken on amd64 */
+ error = copyin(PTRIN(args->msg), &linux_msg, sizeof(linux_msg));
+ if (error)
+ return (error);
- if ((error = copyin(PTRIN(args->msg), &msg, sizeof (msg))))
+ error = linux_to_bsd_msghdr(&msg, &linux_msg);
+ if (error)
return (error);
- bsd_args.s = args->s;
- bsd_args.msg = PTRIN(args->msg);
- bsd_args.flags = linux_to_bsd_msg_flags(args->flags);
- if (msg.msg_name) {
- linux_to_bsd_sockaddr((struct sockaddr *)msg.msg_name,
- msg.msg_namelen);
- error = recvmsg(td, &bsd_args);
- bsd_to_linux_sockaddr((struct sockaddr *)msg.msg_name);
- } else
- error = recvmsg(td, &bsd_args);
+#ifdef COMPAT_LINUX32
+ error = linux32_copyiniov(PTRIN(msg.msg_iov), msg.msg_iovlen,
+ &iov, EMSGSIZE);
+#else
+ error = copyiniov(msg.msg_iov, msg.msg_iovlen, &iov, EMSGSIZE);
+#endif
if (error)
return (error);
- if (bsd_args.msg->msg_control != NULL &&
- bsd_args.msg->msg_controllen > 0) {
- cmsg = (struct cmsghdr*)bsd_args.msg->msg_control;
- cmsg->cmsg_level = bsd_to_linux_sockopt_level(cmsg->cmsg_level);
+ if (msg.msg_name) {
+ error = linux_to_bsd_sockaddr((struct sockaddr *)msg.msg_name,
+ msg.msg_namelen);
+ if (error)
+ goto bad;
}
- error = copyin(PTRIN(args->msg), &msg, sizeof(msg));
+ uiov = msg.msg_iov;
+ msg.msg_iov = iov;
+ controlp = (msg.msg_control != NULL) ? &control : NULL;
+ error = kern_recvit(td, args->s, &msg, UIO_USERSPACE, controlp);
+ msg.msg_iov = uiov;
+ if (error)
+ goto bad;
+
+ error = bsd_to_linux_msghdr(&msg, &linux_msg);
if (error)
- return (error);
- if (msg.msg_name && msg.msg_namelen > 2)
- error = linux_sa_put(msg.msg_name);
+ goto bad;
+
+ if (linux_msg.msg_name) {
+ error = bsd_to_linux_sockaddr((struct sockaddr *)
+ PTRIN(linux_msg.msg_name));
+ if (error)
+ goto bad;
+ }
+ if (linux_msg.msg_name && linux_msg.msg_namelen > 2) {
+ error = linux_sa_put(PTRIN(linux_msg.msg_name));
+ if (error)
+ goto bad;
+ }
+
+ if (control) {
+
+ linux_cmsg = malloc(L_CMSG_HDRSZ, M_TEMP, M_WAITOK | M_ZERO);
+ outbuf = PTRIN(linux_msg.msg_control);
+ cm = mtod(control, struct cmsghdr *);
+ outlen = 0;
+ clen = control->m_len;
+
+ while (cm != NULL) {
+
+ if ((linux_cmsg->cmsg_type =
+ bsd_to_linux_cmsg_type(cm->cmsg_type)) == -1)
+ {
+ error = EINVAL;
+ goto bad;
+ }
+ data = CMSG_DATA(cm);
+ datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data;
+
+ if (outlen + LINUX_CMSG_LEN(datalen) >
+ linux_msg.msg_controllen) {
+ if (outlen == 0) {
+ error = EMSGSIZE;
+ goto bad;
+ } else {
+ linux_msg.msg_flags |= LINUX_MSG_CTRUNC;
+ goto out;
+ }
+ }
+
+ linux_cmsg->cmsg_len = LINUX_CMSG_LEN(datalen);
+ linux_cmsg->cmsg_level =
+ bsd_to_linux_sockopt_level(cm->cmsg_level);
+
+ error = copyout(linux_cmsg, outbuf, L_CMSG_HDRSZ);
+ if (error)
+ goto bad;
+ outbuf += L_CMSG_HDRSZ;
+
+ error = copyout(data, outbuf, datalen);
+ if (error)
+ goto bad;
+
+ outbuf += LINUX_CMSG_ALIGN(datalen);
+ outlen += LINUX_CMSG_LEN(datalen);
+ linux_msg.msg_controllen = outlen;
+
+ if (CMSG_SPACE(datalen) < clen) {
+ clen -= CMSG_SPACE(datalen);
+ cm = (struct cmsghdr *)
+ ((caddr_t)cm + CMSG_SPACE(datalen));
+ } else
+ cm = NULL;
+ }
+ }
+
+out:
+ error = copyout(&linux_msg, PTRIN(args->msg), sizeof(linux_msg));
+
+bad:
+ free(iov, M_IOV);
+ if (control != NULL)
+ m_freem(control);
+ if (linux_cmsg != NULL)
+ free(linux_cmsg, M_TEMP);
+
return (error);
}
==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.h#2 (text+ko) ====
@@ -25,7 +25,7 @@
* (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: src/sys/compat/linux/linux_socket.h,v 1.2 2002/06/02 20:05:42 schweikh Exp $
+ * $FreeBSD: src/sys/compat/linux/linux_socket.h,v 1.3 2008/11/29 17:14:06 kib Exp $
*/
#ifndef _LINUX_SOCKET_H_
@@ -49,4 +49,35 @@
#define LINUX_MSG_ERRQUEUE 0x2000
#define LINUX_MSG_NOSIGNAL 0x4000
+/* Socket-level control message types */
+
+#define LINUX_SCM_RIGHTS 0x01
+
+/* Ancilliary data object information macros */
+
+#define LINUX_CMSG_ALIGN(len) roundup2(len, sizeof(l_ulong))
+#define LINUX_CMSG_DATA(cmsg) ((void *)((char *)(cmsg) + \
+ LINUX_CMSG_ALIGN(sizeof(struct l_cmsghdr))))
+#define LINUX_CMSG_SPACE(len) (LINUX_CMSG_ALIGN(sizeof(struct l_cmsghdr)) + \
+ LINUX_CMSG_ALIGN(len))
+#define LINUX_CMSG_LEN(len) (LINUX_CMSG_ALIGN(sizeof(struct l_cmsghdr)) + \
+ (len))
+#define LINUX_CMSG_FIRSTHDR(msg) \
+ ((msg)->msg_controllen >= \
+ sizeof(struct l_cmsghdr) ? \
+ (struct l_cmsghdr *)((msg)->msg_control) : \
+ (struct l_cmsghdr *)(NULL))
+#define LINUX_CMSG_NXTHDR(msg, cmsg) \
+ ((((char *)(cmsg) + \
+ LINUX_CMSG_ALIGN((cmsg)->cmsg_len) + \
+ sizeof(*(cmsg))) > \
+ (((char *)(msg)->msg_control) + \
+ (msg)->msg_controllen)) ? \
+ (struct l_cmsghdr *) NULL : \
+ (struct l_cmsghdr *)((char *)(cmsg) + \
+ LINUX_CMSG_ALIGN((cmsg)->cmsg_len)))
+
+#define CMSG_HDRSZ CMSG_LEN(0)
+#define L_CMSG_HDRSZ LINUX_CMSG_LEN(0)
+
#endif /* _LINUX_SOCKET_H_ */
==== //depot/projects/vimage-commit2/src/sys/dev/asmc/asmc.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.10 2008/09/07 18:15:34 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.11 2008/11/29 14:20:36 rpaulo Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -254,6 +254,9 @@
char *model;
model = getenv("smbios.system.product");
+ if (model == NULL)
+ return (NULL);
+
for (i = 0; asmc_models[i].smc_model; i++) {
if (!strncmp(model, asmc_models[i].smc_model, strlen(model))) {
freeenv(model);
==== //depot/projects/vimage-commit2/src/sys/dev/k8temp/k8temp.c#4 (text) ====
@@ -30,7 +30,7 @@
*/
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list