Commit ee4fa23c authored by H. J. Lu's avatar H. J. Lu Committed by H. Peter Anvin
Browse files

compat: Use COMPAT_USE_64BIT_TIME in net/compat.c 



Handle 64-bit time structures in the networking core compat code.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: David S. Miller <davem@davemloft.net>
parent da88cea1

net/compat.c

+40 −25
Original line number Diff line number Diff line
@@ -219,8 +219,6 @@ int cmsghdr_from_user_compat_to_kern(struct msghdr *kmsg, struct sock *sk, 


int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)

{

	struct compat_timeval ctv;

	struct compat_timespec cts[3];

	struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;

	struct compat_cmsghdr cmhdr;

	int cmlen;
@@ -230,6 +228,9 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat 
		return 0; /* XXX: return error? check spec. */

	}



	if (!COMPAT_USE_64BIT_TIME) {

		struct compat_timeval ctv;

		struct compat_timespec cts[3];

		if (level == SOL_SOCKET && type == SCM_TIMESTAMP) {

			struct timeval *tv = (struct timeval *)data;

			ctv.tv_sec = tv->tv_sec;
@@ -249,6 +250,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat 
			data = &cts;

			len = sizeof(cts[0]) * count;

		}

	}



	cmlen = CMSG_COMPAT_LEN(len);

	if (kmsg->msg_controllen < cmlen) {
@@ -454,11 +456,15 @@ static int compat_sock_getsockopt(struct socket *sock, int level, int optname, 


int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp)

{

	struct compat_timeval __user *ctv =

			(struct compat_timeval __user *) userstamp;

	int err = -ENOENT;

	struct compat_timeval __user *ctv;

	int err;

	struct timeval tv;



	if (COMPAT_USE_64BIT_TIME)

		return sock_get_timestamp(sk, userstamp);



	ctv = (struct compat_timeval __user *) userstamp;

	err = -ENOENT;

	if (!sock_flag(sk, SOCK_TIMESTAMP))

		sock_enable_timestamp(sk, SOCK_TIMESTAMP);

	tv = ktime_to_timeval(sk->sk_stamp);
@@ -478,11 +484,15 @@ EXPORT_SYMBOL(compat_sock_get_timestamp); 


int compat_sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp)

{

	struct compat_timespec __user *ctv =

			(struct compat_timespec __user *) userstamp;

	int err = -ENOENT;

	struct compat_timespec __user *ctv;

	int err;

	struct timespec ts;



	if (COMPAT_USE_64BIT_TIME)

		return sock_get_timestampns (sk, userstamp);



	ctv = (struct compat_timespec __user *) userstamp;

	err = -ENOENT;

	if (!sock_flag(sk, SOCK_TIMESTAMP))

		sock_enable_timestamp(sk, SOCK_TIMESTAMP);

	ts = ktime_to_timespec(sk->sk_stamp);
@@ -767,6 +777,11 @@ asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg, 
	int datagrams;

	struct timespec ktspec;



	if (COMPAT_USE_64BIT_TIME)

		return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,

				      flags | MSG_CMSG_COMPAT,

				      (struct timespec *) timeout);



	if (timeout == NULL)

		return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,

				      flags | MSG_CMSG_COMPAT, NULL);