diff options
| author |   Deepa Dinamani <deepa.kernel@gmail.com> | 2019-02-02 07:34:48 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-02-03 11:17:30 -0800 |
| commit | 13c6ee2a921683bae4bb4ba57b1f5b82f49e6b8a (patch) | |
| tree | 6603af04975126384041dacb4d094d58e6de7b6b /net/compat.c | |
| parent | arch: sparc: Override struct __kernel_old_timeval (diff) | |
| download | linux-dev-13c6ee2a921683bae4bb4ba57b1f5b82f49e6b8a.tar.xz linux-dev-13c6ee2a921683bae4bb4ba57b1f5b82f49e6b8a.zip | |
socket: Use old_timeval types for socket timestamps
As part of y2038 solution, all internal uses of
struct timeval are replaced by struct __kernel_old_timeval
and struct compat_timeval by struct old_timeval32.
Make socket timestamps use these new types.
This is mainly to be able to verify that the kernel build
is y2038 safe when such non y2038 safe types are not
supported anymore.
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Cc: isdn@linux-pingi.de
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/compat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/compat.c b/net/compat.c index ccf93cd0e49b..9629f053d4fa 100644 --- a/net/compat.c +++ b/net/compat.c @@ -209,8 +209,8 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat { struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control; struct compat_cmsghdr cmhdr; - struct compat_timeval ctv; - struct compat_timespec cts[3]; + struct old_timeval32 ctv; + struct old_timespec32 cts[3]; int cmlen; if (cm == NULL || kmsg->msg_controllen < sizeof(*cm)) { @@ -220,7 +220,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat if (!COMPAT_USE_64BIT_TIME) { if (level == SOL_SOCKET && type == SO_TIMESTAMP_OLD) { - struct timeval *tv = (struct timeval *)data; + struct __kernel_old_timeval *tv = (struct __kernel_old_timeval *)data; ctv.tv_sec = tv->tv_sec; ctv.tv_usec = tv->tv_usec; data = &ctv; |