From 87f276ca269858155e2168e6af9de3ef4fef4087 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 9 Dec 2009 20:59:15 +0000 Subject: [PATCH] --- yaml --- r: 175569 b: refs/heads/master c: de039f02d877af52b8d0fe77878b8343a0f99d8b h: refs/heads/master i: 175567: c135f46823b34fed02f9298a0242d180af55c1f7 v: v3 --- [refs] | 2 +- trunk/net/compat.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5321b7d4eb33..a32a5fab1563 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60c2ffd3d2cf12008747d920ae118df119006003 +refs/heads/master: de039f02d877af52b8d0fe77878b8343a0f99d8b diff --git a/trunk/net/compat.c b/trunk/net/compat.c index c4d9131a5872..a1fb1b079a82 100644 --- a/trunk/net/compat.c +++ b/trunk/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;