summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2009-12-09 20:59:15 +0000
committerDavid S. Miller <davem@davemloft.net>2009-12-11 15:07:57 -0800
commitde039f02d877af52b8d0fe77878b8343a0f99d8b (patch)
tree81d312952e828bddb53ff5d540f37b0ce8b202f6 /net
parent60c2ffd3d2cf12008747d920ae118df119006003 (diff)
downloadlinux-3.10-de039f02d877af52b8d0fe77878b8343a0f99d8b.tar.gz
linux-3.10-de039f02d877af52b8d0fe77878b8343a0f99d8b.tar.bz2
linux-3.10-de039f02d877af52b8d0fe77878b8343a0f99d8b.zip
net: use compat helper functions in compat_sys_recvmmsg
Use (get|put)_compat_timespec helper functions to simplify the code. 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.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/compat.c b/net/compat.c
index c4d9131a587..a1fb1b079a8 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -763,15 +763,12 @@ asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
flags | MSG_CMSG_COMPAT, NULL);
- if (get_user(ktspec.tv_sec, &timeout->tv_sec) ||
- get_user(ktspec.tv_nsec, &timeout->tv_nsec))
+ if (get_compat_timespec(&ktspec, timeout))
return -EFAULT;
datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
flags | MSG_CMSG_COMPAT, &ktspec);
- if (datagrams > 0 &&
- (put_user(ktspec.tv_sec, &timeout->tv_sec) ||
- put_user(ktspec.tv_nsec, &timeout->tv_nsec)))
+ if (datagrams > 0 && put_compat_timespec(&ktspec, timeout))
datagrams = -EFAULT;
return datagrams;