Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de039f02 authored by Heiko Carstens's avatar Heiko Carstens Committed by David S. Miller
Browse files

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60c2ffd3

net/compat.c

+2 −5
Original line number Diff line number Diff line
@@ -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;