From 8016b519455ccd3fca3104b26a7406a19878d2b2 Mon Sep 17 00:00:00 2001 From: Jean-Mickael Guerin Date: Tue, 1 Dec 2009 07:52:16 +0000 Subject: [PATCH] --- yaml --- r: 172078 b: refs/heads/master c: 5b23136bcf766a58160a319677b366c90f0cd223 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/compat.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d4d4a296f84d..ee46b0234f53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7256d0eb4c82b789125f610fea11c6e82b1bcff +refs/heads/master: 5b23136bcf766a58160a319677b366c90f0cd223 diff --git a/trunk/net/compat.c b/trunk/net/compat.c index 6a2f75fb3f45..e1a56ade803b 100644 --- a/trunk/net/compat.c +++ b/trunk/net/compat.c @@ -758,9 +758,13 @@ asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg, { int datagrams; struct timespec ktspec; - struct compat_timespec __user *utspec = - (struct compat_timespec __user *)timeout; + struct compat_timespec __user *utspec; + if (timeout == NULL) + return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, + flags | MSG_CMSG_COMPAT, NULL); + + utspec = (struct compat_timespec __user *)timeout; if (get_user(ktspec.tv_sec, &utspec->tv_sec) || get_user(ktspec.tv_nsec, &utspec->tv_nsec)) return -EFAULT;