diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2014-03-04 17:09:57 +0100 |
|---|---|---|
| committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2014-03-06 16:30:45 +0100 |
| commit | 3a49a0f7181c243aa04e6c5e44ca70a90ead8f9a (patch) | |
| tree | 9b4609fddab00f06e9ebdb206f91c66961e38e66 | |
| parent | 8eee9093cdbeb2aa89d67dc1a3fd118acabaea52 (diff) | |
| download | linux-3a49a0f7181c243aa04e6c5e44ca70a90ead8f9a.tar.gz linux-3a49a0f7181c243aa04e6c5e44ca70a90ead8f9a.tar.bz2 linux-3a49a0f7181c243aa04e6c5e44ca70a90ead8f9a.zip | |
net/compat: convert to COMPAT_SYSCALL_DEFINE with changing parameter types
In order to allow the COMPAT_SYSCALL_DEFINE macro generate code that
performs proper zero and sign extension convert all 64 bit parameters
to their corresponding 32 bit compat counterparts.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
| -rw-r--r-- | include/linux/compat.h | 4 | ||||
| -rw-r--r-- | net/compat.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index f670e591aff8..8e636211f334 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -569,9 +569,9 @@ asmlinkage long compat_sys_sendmmsg(int fd, struct compat_mmsghdr __user *mmsg, unsigned vlen, unsigned int flags); asmlinkage long compat_sys_recvmsg(int fd, struct compat_msghdr __user *msg, unsigned int flags); -asmlinkage long compat_sys_recv(int fd, void __user *buf, size_t len, +asmlinkage long compat_sys_recv(int fd, void __user *buf, compat_size_t len, unsigned flags); -asmlinkage long compat_sys_recvfrom(int fd, void __user *buf, size_t len, +asmlinkage long compat_sys_recvfrom(int fd, void __user *buf, compat_size_t len, unsigned flags, struct sockaddr __user *addr, int __user *addrlen); asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg, diff --git a/net/compat.c b/net/compat.c index 706b78be9a23..9a76eaf63184 100644 --- a/net/compat.c +++ b/net/compat.c @@ -758,14 +758,14 @@ COMPAT_SYSCALL_DEFINE3(recvmsg, int, fd, struct compat_msghdr __user *, msg, uns return __sys_recvmsg(fd, (struct msghdr __user *)msg, flags | MSG_CMSG_COMPAT); } -asmlinkage long compat_sys_recv(int fd, void __user *buf, size_t len, unsigned int flags) +COMPAT_SYSCALL_DEFINE4(recv, int, fd, void __user *, buf, compat_size_t, len, unsigned int, flags) { return sys_recv(fd, buf, len, flags | MSG_CMSG_COMPAT); } -asmlinkage long compat_sys_recvfrom(int fd, void __user *buf, size_t len, - unsigned int flags, struct sockaddr __user *addr, - int __user *addrlen) +COMPAT_SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, buf, compat_size_t, len, + unsigned int, flags, struct sockaddr __user *, addr, + int __user *, addrlen) { return sys_recvfrom(fd, buf, len, flags | MSG_CMSG_COMPAT, addr, addrlen); } |