mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

compat: Use COMPAT_USE_64BIT_TIME in net/compat.c

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

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: David S. Miller <davem@davemloft.net>
This commit is contained in:
H. J. Lu 2012-02-19 17:50:46 -08:00 committed by H. Peter Anvin
parent da88cea120
commit ee4fa23c4b
1 changed files with 40 additions and 25 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

65
net/compat.c
View file

@ -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) 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 __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
struct compat_cmsghdr cmhdr; struct compat_cmsghdr cmhdr;
int cmlen; int cmlen;
@ -230,24 +228,28 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
return 0; /* XXX: return error? check spec. */ return 0; /* XXX: return error? check spec. */
} }
if (level == SOL_SOCKET && type == SCM_TIMESTAMP) { if (!COMPAT_USE_64BIT_TIME) {
struct timeval *tv = (struct timeval *)data; struct compat_timeval ctv;
ctv.tv_sec = tv->tv_sec; struct compat_timespec cts[3];
ctv.tv_usec = tv->tv_usec; if (level == SOL_SOCKET && type == SCM_TIMESTAMP) {
data = &ctv; struct timeval *tv = (struct timeval *)data;
len = sizeof(ctv); ctv.tv_sec = tv->tv_sec;
} ctv.tv_usec = tv->tv_usec;
if (level == SOL_SOCKET && data = &ctv;
(type == SCM_TIMESTAMPNS || type == SCM_TIMESTAMPING)) { len = sizeof(ctv);
int count = type == SCM_TIMESTAMPNS ? 1 : 3; }
int i; if (level == SOL_SOCKET &&
struct timespec *ts = (struct timespec *)data; (type == SCM_TIMESTAMPNS || type == SCM_TIMESTAMPING)) {
for (i = 0; i < count; i++) { int count = type == SCM_TIMESTAMPNS ? 1 : 3;
cts[i].tv_sec = ts[i].tv_sec; int i;
cts[i].tv_nsec = ts[i].tv_nsec; struct timespec *ts = (struct timespec *)data;
for (i = 0; i < count; i++) {
cts[i].tv_sec = ts[i].tv_sec;
cts[i].tv_nsec = ts[i].tv_nsec;
}
data = &cts;
len = sizeof(cts[0]) * count;
} }
data = &cts;
len = sizeof(cts[0]) * count;
} }
cmlen = CMSG_COMPAT_LEN(len); cmlen = CMSG_COMPAT_LEN(len);
@ -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) int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp)
{ {
struct compat_timeval __user *ctv = struct compat_timeval __user *ctv;
(struct compat_timeval __user *) userstamp; int err;
int err = -ENOENT;
struct timeval tv; 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)) if (!sock_flag(sk, SOCK_TIMESTAMP))
sock_enable_timestamp(sk, SOCK_TIMESTAMP); sock_enable_timestamp(sk, SOCK_TIMESTAMP);
tv = ktime_to_timeval(sk->sk_stamp); 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) int compat_sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp)
{ {
struct compat_timespec __user *ctv = struct compat_timespec __user *ctv;
(struct compat_timespec __user *) userstamp; int err;
int err = -ENOENT;
struct timespec ts; 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)) if (!sock_flag(sk, SOCK_TIMESTAMP))
sock_enable_timestamp(sk, SOCK_TIMESTAMP); sock_enable_timestamp(sk, SOCK_TIMESTAMP);
ts = ktime_to_timespec(sk->sk_stamp); 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; int datagrams;
struct timespec ktspec; 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) if (timeout == NULL)
return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
flags | MSG_CMSG_COMPAT, NULL); flags | MSG_CMSG_COMPAT, NULL);