Skip to contentSkip to conversation

net: fix compat_sys_recvmmsg parameter type

PATCH Applied Heiko Carstens 3 participants 3 messages Dec 10, 2009 – Dec 11, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 net: fix compat_sys_recvmmsg parameter type

From: Heiko Carstens <[email protected]>

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 <[email protected]>
---
 include/net/compat.h |    2 +-
 net/compat.c         |   12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)
include/net/compat.h +1 -1
Index: linux-2.6/include/net/compat.h
===================================================================
@@ -46,7 +46,7 @@ extern asmlinkage long compat_sys_sendms
 extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned);
 extern asmlinkage long compat_sys_recvmmsg(int, struct compat_mmsghdr __user *,
 					   unsigned, unsigned,
-					   struct timespec __user *);
+					   struct compat_timespec __user *);
 extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);
 extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
 
net/compat.c +5 -7
Index: linux-2.6/net/compat.c
===================================================================
@@ -754,26 +754,24 @@ asmlinkage long compat_sys_recvfrom(int 
 
 asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
 				    unsigned vlen, unsigned int flags,
-				    struct timespec __user *timeout)
+				    struct compat_timespec __user *timeout)
 {
 	int datagrams;
 	struct timespec ktspec;
-	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))
+	if (get_user(ktspec.tv_sec, &timeout->tv_sec) ||
+	    get_user(ktspec.tv_nsec, &timeout->tv_nsec))
 		return -EFAULT;
 
 	datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
 				   flags | MSG_CMSG_COMPAT, &ktspec);
 	if (datagrams > 0 &&
-	    (put_user(ktspec.tv_sec, &utspec->tv_sec) ||
-	     put_user(ktspec.tv_nsec, &utspec->tv_nsec)))
+	    (put_user(ktspec.tv_sec, &timeout->tv_sec) ||
+	     put_user(ktspec.tv_nsec, &timeout->tv_nsec)))
 		datagrams = -EFAULT;
 
 	return datagrams;
Acked-by on v1 1/2
#1 lore raw

Em Thu, Dec 10, 2009 at 07:58:16AM +0100, Heiko Carstens escreveu:

Quoted 7 lines

From: Heiko Carstens <[email protected]>

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 <[email protected]>

Was unaware of this helper, thanks!

maintainer Applied
#2 lore raw

From: Arnaldo Carvalho de Melo <[email protected]>
Date: Thu, 10 Dec 2009 10:47:06 -0200

Quoted 6 lines

Em Thu, Dec 10, 2009 at 07:58:16AM +0100, Heiko Carstens escreveu:

Quoted 5 lines

From: Heiko Carstens <[email protected]>

compat_sys_recvmmsg has a compat_timespec parameter and not a timespec parameter. This way we also get rid of an odd cast.

Quoted 6 lines
Quoted 2 lines
Cc Arnaldo Carvalho de Melo <[email protected]>

Was unaware of this helper, thanks!

Applied.