aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2009-12-09 15:58:16 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-11 18:07:56 -0500
commit60c2ffd3d2cf12008747d920ae118df119006003 (patch)
tree7b4e86de5eed6a5377bba5a875b326420fe3503b /net
parentccdddf500f2b1b8e88ac8e3d4dfc15cce9f73886 (diff)
net: fix compat_sys_recvmmsg parameter type
compat_sys_recvmmsg has a compat_timespec parameter and not a timespec parameter. This way we also get rid of an odd cast. Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/compat.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/net/compat.c b/net/compat.c
index e1a56ade803b..c4d9131a5872 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -754,26 +754,24 @@ asmlinkage long compat_sys_recvfrom(int fd, void __user *buf, size_t len,
754 754
755asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg, 755asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
756 unsigned vlen, unsigned int flags, 756 unsigned vlen, unsigned int flags,
757 struct timespec __user *timeout) 757 struct compat_timespec __user *timeout)
758{ 758{
759 int datagrams; 759 int datagrams;
760 struct timespec ktspec; 760 struct timespec ktspec;
761 struct compat_timespec __user *utspec;
762 761
763 if (timeout == NULL) 762 if (timeout == NULL)
764 return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, 763 return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
765 flags | MSG_CMSG_COMPAT, NULL); 764 flags | MSG_CMSG_COMPAT, NULL);
766 765
767 utspec = (struct compat_timespec __user *)timeout; 766 if (get_user(ktspec.tv_sec, &timeout->tv_sec) ||
768 if (get_user(ktspec.tv_sec, &utspec->tv_sec) || 767 get_user(ktspec.tv_nsec, &timeout->tv_nsec))
769 get_user(ktspec.tv_nsec, &utspec->tv_nsec))
770 return -EFAULT; 768 return -EFAULT;
771 769
772 datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, 770 datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
773 flags | MSG_CMSG_COMPAT, &ktspec); 771 flags | MSG_CMSG_COMPAT, &ktspec);
774 if (datagrams > 0 && 772 if (datagrams > 0 &&
775 (put_user(ktspec.tv_sec, &utspec->tv_sec) || 773 (put_user(ktspec.tv_sec, &timeout->tv_sec) ||
776 put_user(ktspec.tv_nsec, &utspec->tv_nsec))) 774 put_user(ktspec.tv_nsec, &timeout->tv_nsec)))
777 datagrams = -EFAULT; 775 datagrams = -EFAULT;
778 776
779 return datagrams; 777 return datagrams;