[PATCH] vsock: Handle compat 32-bit timeout
From: Richard Palethorpe <hidden>
Date: 2021-10-06 07:47:21
Also in:
lkml
Subsystem:
networking [general], the rest, vm sockets (af_vsock) · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Stefano Garzarella
Allow 32-bit timevals to be used with a 64-bit kernel.
This allows the LTP regression test vsock01 to run without
modification in 32-bit compat mode.
Fixes: fe0c72f3db11 ("socket: move compat timeout handling into sock.c")
Signed-off-by: Richard Palethorpe <redacted>
---
This is one of those fixes where I am not sure if we should just
change the test instead. Because it's not clear if someone is likely
to use vsock's in 32-bit compat mode?
net/vmw_vsock/af_vsock.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 3e02cc3b24f8..6e9232adf8d0 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c@@ -1616,7 +1616,16 @@ static int vsock_connectible_setsockopt(struct socket *sock, case SO_VM_SOCKETS_CONNECT_TIMEOUT: { struct __kernel_old_timeval tv; - COPY_IN(tv); + struct old_timeval32 tv32; + + if (in_compat_syscall() && !COMPAT_USE_64BIT_TIME) { + COPY_IN(tv32); + tv.tv_sec = tv32.tv_sec; + tv.tv_usec = tv32.tv_usec; + } else { + COPY_IN(tv); + } + if (tv.tv_sec >= 0 && tv.tv_usec < USEC_PER_SEC && tv.tv_sec < (MAX_SCHEDULE_TIMEOUT / HZ - 1)) { vsk->connect_timeout = tv.tv_sec * HZ +
@@ -1694,11 +1703,20 @@ static int vsock_connectible_getsockopt(struct socket *sock, case SO_VM_SOCKETS_CONNECT_TIMEOUT: { struct __kernel_old_timeval tv; + struct old_timeval32 tv32; + tv.tv_sec = vsk->connect_timeout / HZ; tv.tv_usec = (vsk->connect_timeout - tv.tv_sec * HZ) * (1000000 / HZ); - COPY_OUT(tv); + + if (in_compat_syscall() && !COMPAT_USE_64BIT_TIME) { + tv32.tv_sec = (u32)tv.tv_sec; + tv32.tv_usec = (u32)tv.tv_usec; + COPY_OUT(tv32); + } else { + COPY_OUT(tv); + } break; } default:
--
2.33.0