diff options
| author | kib <kib@FreeBSD.org> | 2010-03-19 10:46:54 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2010-03-19 10:46:54 +0000 |
| commit | b145781d4986761ace10007642728c9b9e5562d5 (patch) | |
| tree | d6eeed08e99225d231e3f01d0b560ac80faa351a /sys/kern | |
| parent | 0c73b784955d56d8d72e9ca78fb1767a48443cce (diff) | |
| download | FreeBSD-src-b145781d4986761ace10007642728c9b9e5562d5.zip FreeBSD-src-b145781d4986761ace10007642728c9b9e5562d5.tar.gz | |
Properly handle compat32 calls to sctp generic sendmsd/recvmsg functions that
take iov.
Reviewed by: tuexen
MFC after: 2 weeks
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 4b9eb4e..a14be72 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/sf_buf.h> +#include <sys/sysent.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/signalvar.h> @@ -69,6 +70,9 @@ __FBSDID("$FreeBSD$"); #ifdef KTRACE #include <sys/ktrace.h> #endif +#ifdef COMPAT_FREEBSD32 +#include <compat/freebsd32/freebsd32_util.h> +#endif #include <net/vnet.h> @@ -2513,7 +2517,13 @@ sctp_generic_sendmsg_iov(td, uap) if (error) goto sctp_bad1; - error = copyiniov(uap->iov, uap->iovlen, &iov, EMSGSIZE); +#ifdef COMPAT_FREEBSD32 + if (SV_CURPROC_FLAG(SV_ILP32)) + error = freebsd32_copyiniov((struct iovec32 *)uap->iov, + uap->iovlen, &iov, EMSGSIZE); + else +#endif + error = copyiniov(uap->iov, uap->iovlen, &iov, EMSGSIZE); if (error) goto sctp_bad1; #ifdef KTRACE @@ -2615,10 +2625,15 @@ sctp_generic_recvmsg(td, uap) if (error) { return (error); } - error = copyiniov(uap->iov, uap->iovlen, &iov, EMSGSIZE); - if (error) { +#ifdef COMPAT_FREEBSD32 + if (SV_CURPROC_FLAG(SV_ILP32)) + error = freebsd32_copyiniov((struct iovec32 *)uap->iov, + uap->iovlen, &iov, EMSGSIZE); + else +#endif + error = copyiniov(uap->iov, uap->iovlen, &iov, EMSGSIZE); + if (error) goto out1; - } so = fp->f_data; #ifdef MAC |
