forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net/compat: convert to COMPAT_SYSCALL_DEFINE with changing parameter types

Browse source 
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>
This commit is contained in:
Heiko Carstens 2014-03-04 17:09:57 +01:00
commit 3a49a0f718
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/compat.h
View file

@ -569,9 +569,9 @@ asmlinkage long compat_sys_sendmmsg(int fd, struct compat_mmsghdr __user *mmsg,
unsigned vlen, unsigned int flags); unsigned vlen, unsigned int flags);
asmlinkage long compat_sys_recvmsg(int fd, struct compat_msghdr __user *msg, asmlinkage long compat_sys_recvmsg(int fd, struct compat_msghdr __user *msg,
unsigned int flags); 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); 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, unsigned flags, struct sockaddr __user *addr,
int __user *addrlen); int __user *addrlen);
asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg, asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,

8
net/compat.c
View file

@ -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); 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); return sys_recv(fd, buf, len, flags | MSG_CMSG_COMPAT);
} }
asmlinkage long compat_sys_recvfrom(int fd, void __user *buf, size_t len, COMPAT_SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, buf, compat_size_t, len,
unsigned int flags, struct sockaddr __user *addr, unsigned int, flags, struct sockaddr __user *, addr,
int __user *addrlen) int __user *, addrlen)
{ {
return sys_recvfrom(fd, buf, len, flags | MSG_CMSG_COMPAT, addr, addrlen); return sys_recvfrom(fd, buf, len, flags | MSG_CMSG_COMPAT, addr, addrlen);
} }